resolve conflict manually

diff --cc sfa/client/sfi.py
index e3f65c9,92a9c0d..1365342
--- 1/sfa/client/sfi.py
--- 2/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/managers/aggregate_manager_pl.py
Simple merge

diff --cc sfa/managers/registry_manager_pl.py
Simple merge

diff --cc sfa/managers/slice_manager_pl.py
Simple merge

diff --cc sfa/methods/RenewSliver.py
Simple merge

diff --cc sfa/trust/certificate.py
Simple merge

diff --cc sfa/trust/credential.py
index 1290532,b46a655..43dc768
--- 1/sfa/trust/credential.py
--- 2/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:

diff --cc sfa/util/namespace.py
Simple merge