git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
3d03c4f
)
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
author
Sandrine Avakian
<sandrine.avakian@inria.fr>
Tue, 15 Nov 2011 14:22:46 +0000
(15:22 +0100)
committer
Sandrine Avakian
<sandrine.avakian@inria.fr>
Tue, 15 Nov 2011 14:22:46 +0000
(15:22 +0100)
sfa/senslab/slab-import.py
patch
|
blob
|
history
diff --git
a/sfa/senslab/slab-import.py
b/sfa/senslab/slab-import.py
index
44a2e8c
..
ae306a8
100644
(file)
--- a/
sfa/senslab/slab-import.py
+++ b/
sfa/senslab/slab-import.py
@@
-10,7
+10,7
@@
from sfa.senslab.OARrestapi import OARapi
from sfa.senslab.LDAPapi import LDAPapi
from sfa.senslab.slabdriver import SlabDriver
from sfa.util.config import Config
-from sfa.util.xrn import hrn_to_urn, get_authority,Xrn
+from sfa.util.xrn import hrn_to_urn, get_authority,Xrn
,get_leaf
from sfa.util.table import SfaTable
from sfa.util.record import SfaRecord
from sfa.trust.hierarchy import Hierarchy