Merge branch 'master' into sqlalchemy
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 8 Feb 2012 12:59:45 +0000 (13:59 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 8 Feb 2012 12:59:45 +0000 (13:59 +0100)
commitb7d6a80faf23cb019c74e65c2264e215446f84a3
tree48f07a80bbde077a8508210689baf90b79c54cc3
parent25dc07a3f55ef5e21c659dcaad5ad7559e8a6896
parentde159151b622def762bf04799515e468aae563a4
Merge branch 'master' into sqlalchemy

Conflicts:
sfa/importer/sfa-import-openstack.py
sfa/managers/registry_manager.py
sfa/openstack/nova_driver.py
sfa/storage/PostgreSQL.py
sfa/storage/filter.py

trashed changes in PostgreSQL / filter
applied changes in sfa-import-openstack.py into openstackimporter.py
this is mostly manual so please double check
sfa/client/sfi.py
sfa/generic/openstack.py
sfa/importer/openstackimporter.py
sfa/managers/registry_manager.py
sfa/openstack/nova_driver.py
sfa/util/xrn.py