From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 27 Oct 2011 20:16:07 +0000 (+0200)
Subject: solve conflicts
X-Git-Tag: sfa-1.1-1~6
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d42c0e79549cbc940fd160f4e9cb1f75e59029ce

solve conflicts
---

d42c0e79549cbc940fd160f4e9cb1f75e59029ce
diff --cc sfa/server/sfaapi.py
index 87f7935e,48ff6e52..1c462575
--- a/sfa/server/sfaapi.py
+++ b/sfa/server/sfaapi.py
@@@ -7,12 -4,11 +7,12 @@@ from sfa.util.cache import Cach
  from sfa.trust.auth import Auth
  from sfa.trust.certificate import Keypair, Certificate
  from sfa.trust.credential import Credential
 -# this is wrong all right, but temporary 
 +
- # this is wrong all right, but temporary 
++# this is wrong all right, but temporary, will use generic
  from sfa.managers.managerwrapper import ManagerWrapper, import_manager
- 
  from sfa.server.xmlrpcapi import XmlrpcApi
+ import os
+ import datetime
  
  ####################
  class SfaApi (XmlrpcApi): 
diff --cc sfa/server/threadedserver.py
index b9b3ba54,8139b0c5..7a9c368b
--- a/sfa/server/threadedserver.py
+++ b/sfa/server/threadedserver.py
@@@ -21,8 -21,8 +21,9 @@@ from sfa.util.config import Confi
  from sfa.util.cache import Cache 
  from sfa.trust.certificate import Certificate
  from sfa.trust.trustedroots import TrustedRoots
 -#can we get rid of that ?
 -from sfa.plc.plcsfaapi import PlcSfaApi
++
 +# don't hard code an api class anymore here
 +from sfa.generic import Generic
  
  ##
  # Verification callback for pyOpenSSL. We do our own checking of keys because