git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge master again (2.0-10 changelog only)
[sfa.git]
/
sfa
/
managers
/
registry_manager_openstack.py
diff --git
a/sfa/managers/registry_manager_openstack.py
b/sfa/managers/registry_manager_openstack.py
index
aee536f
..
6e210fa
100644
(file)
--- a/
sfa/managers/registry_manager_openstack.py
+++ b/
sfa/managers/registry_manager_openstack.py
@@
-18,7
+18,7
@@
from sfa.trust.credential import Credential
from sfa.trust.certificate import Certificate, Keypair, convert_public_key
from sfa.trust.gid import create_uuid
from sfa.trust.certificate import Certificate, Keypair, convert_public_key
from sfa.trust.gid import create_uuid
-from sfa.storage.
persistentobjs
import make_record,RegRecord
+from sfa.storage.
model
import make_record,RegRecord
from sfa.storage.alchemy import dbsession
from sfa.managers.registry_manager import RegistryManager
from sfa.storage.alchemy import dbsession
from sfa.managers.registry_manager import RegistryManager