From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Wed, 13 Oct 2010 14:56:24 +0000 (+0200)
Subject: resolve conflict manually
X-Git-Tag: sfa-1.0-5~29
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=99e9f96209b9ebfd1853e7b8902a1a0fe893eaa2

resolve conflict manually
---

99e9f96209b9ebfd1853e7b8902a1a0fe893eaa2
diff --cc sfa/client/sfi.py
index e3f65c9f,92a9c0dc..13653420
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@@ -15,9 -15,10 +15,10 @@@ from StringIO import StringI
  from types import StringTypes, ListType
  from optparse import OptionParser
  import zlib
 -import logging
  
 +from sfa.util.sfalogging import sfa_logger,sfa_logger_goes_to_console
  from sfa.trust.certificate import Keypair, Certificate
+ from sfa.trust.gid import GID
  from sfa.trust.credential import Credential
  from sfa.util.sfaticket import SfaTicket
  from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
@@@ -25,8 -26,8 +26,7 @@@ from sfa.util.namespace import get_leaf
  from sfa.util.xmlrpcprotocol import ServerException
  import sfa.util.xmlrpcprotocol as xmlrpcprotocol
  from sfa.util.config import Config
 -from sfa.util.sfalogging import console_logger
  
- 
  AGGREGATE_PORT=12346
  CM_PORT=12346
  
diff --cc sfa/trust/credential.py
index 1290532d,b46a6554..43dc7685
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@@ -41,10 -41,10 +41,10 @@@ from sfa.trust.certificate import Keypa
  from sfa.trust.credential_legacy import CredentialLegacy
  from sfa.trust.rights import Right, Rights
  from sfa.trust.gid import GID
 -from sfa.util.namespace import *
 +from sfa.util.namespace import urn_to_hrn
  
- # Two years, in seconds 
- DEFAULT_CREDENTIAL_LIFETIME = 60 * 60 * 24 * 365 * 2
+ # 2 weeks, in seconds 
+ DEFAULT_CREDENTIAL_LIFETIME = 86400 * 14
  
  
  # TODO: