Merge branch 'master' into sqlalchemy
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 24 Jan 2012 12:23:50 +0000 (13:23 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 24 Jan 2012 12:23:50 +0000 (13:23 +0100)
commit6f0a757c5adf47b4d222cec09514dcd688b93457
treea698017ee059f96400794c326aeb039d057962e0
parent5870a2bc6732f7d8e02b1aa7ea96535f32ddd656
parente0700ed85b01e1a345565826640a30017ea08a1c
Merge branch 'master' into sqlalchemy

Conflicts:
sfa/managers/registry_manager_openstack.py
sfa/client/sfi.py
sfa/managers/registry_manager_openstack.py
sfa/server/sfa-clean-peer-records.py
sfa/server/sfa-start.py