From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 28 Nov 2011 19:44:57 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-1~6^2~4
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=080e7f90e2c66067aea94c96c4de68fc998e009b

Merge branch 'master' of ssh://git.onelab.eu/git/sfa

Conflicts:
	sfa/util/config.py
---

080e7f90e2c66067aea94c96c4de68fc998e009b
diff --cc sfa/client/sfi.py
index 28fe3ffa,f89c5e05..ae4d97a5
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@@ -25,15 -26,10 +25,16 @@@ from sfa.util.xrn import get_leaf, get_
  from sfa.util.config import Config
  from sfa.util.version import version_core
  from sfa.util.cache import Cache
 +from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
 +
 +from sfa.rspecs.rspec import RSpec
 +from sfa.rspecs.rspec_converter import RSpecConverter
  from sfa.rspecs.version_manager import VersionManager
+ from sfa.client.return_value import ReturnValue
  
 +import sfa.client.xmlrpcprotocol as xmlrpcprotocol
 +from sfa.client.client_helper import pg_users_arg, sfa_users_arg
 +
  AGGREGATE_PORT=12346
  CM_PORT=12346