Merge branch 'upstreammaster'
[sfa.git] / sfa / openstack / nova_driver.py