Michael DeHaan 66eddfd491 Merge branch 'nova-compute-enhancements' of git://github.com/emonty/ansible into devel ... Conflicts: lib/ansible/module_utils/openstack.py library/cloud/nova_compute		2014-08-08 11:05:13 -04:00
..
ansible	Merge branch 'nova-compute-enhancements' of git://github.com/emonty/ansible into devel	2014-08-08 11:05:13 -04:00