Merge branch 'master' into senslab2
Sandrine Avakian [Tue, 29 May 2012 09:18:37 +0000 (11:18 +0200)]
Conflicts:
setup.py

1  2 
setup.py
sfa/client/sfi.py
sfa/managers/driver.py
sfa/planetlab/plslices.py
sfa/trust/auth.py
tests/testXrn.py

diff --cc setup.py
+++ b/setup.py
@@@ -32,8 -32,7 +32,12 @@@ packages = 
      'sfa/generic',
      'sfa/managers',
      'sfa/importer',
-     'sfa/plc',
++
++
 +    'sfa/senslab',
++
+     'sfa/planetlab',
++
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',
Simple merge
Simple merge
Simple merge
@@@ -235,10 -231,10 +235,10 @@@ class Auth
              return
          #if name.startswith(get_authority(name)):
              #return
 -    
 +
          raise PermissionError(name)
  
-     def determine_user_rights(self, caller_hrn, record):
+     def determine_user_rights(self, caller_hrn, reg_record):
          """
          Given a user credential and a record, determine what set of rights the
          user should have to that record.
Simple merge