openstack.py
3.23 KB
-
Merge branch 'nova-compute-enhancements' of git://github.com/emonty/ansible into devel · 66eddfd4
Conflicts: lib/ansible/module_utils/openstack.py library/cloud/nova_compute
Michael DeHaan committed
Conflicts: lib/ansible/module_utils/openstack.py library/cloud/nova_compute