Merge Master in geni-v3 conflict resolution sfa-3.0-0
authorMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 25 Mar 2013 16:06:12 +0000 (17:06 +0100)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 25 Mar 2013 16:06:12 +0000 (17:06 +0100)
commit1cc8e9613cab8b5b22478de369f259e591c54e6d
treee9d08e9861df7b69011831faa65d0c0d366d514b
parentad6e6a07af006740c39cfbf091f7514dc7f8e507
parentf357d5c677573e29f260f82318c9450119474dce
Merge Master in geni-v3 conflict resolution
19 files changed:
init.d/sfa
setup.py
sfa/client/client_helper.py
sfa/client/sfaadmin.py
sfa/client/sfi.py
sfa/importer/plimporter.py
sfa/managers/registry_manager.py
sfa/openstack/osaggregate.py
sfa/planetlab/plaggregate.py
sfa/planetlab/pldriver.py
sfa/planetlab/plslices.py
sfa/rspecs/elements/node.py
sfa/rspecs/elements/versions/pgv2Node.py
sfa/rspecs/elements/versions/sfav1Lease.py
sfa/rspecs/elements/versions/sfav1Node.py
sfa/rspecs/rspec.py
sfa/server/sfaapi.py
sfa/storage/model.py
sfa/trust/credential.py