Steve Noyes 1cdd533d5b Merge branch 'o3l_2.next' ... Conflicts: kollacli/commands/host.py kollacli/common/ansible/actions.py kollacli/common/ansible/playbook.py kollacli/common/inventory.py kollacli/common/utils.py tests/deploy.py Jira-Issue: OSTACKDEV-20		2016-03-18 14:10:45 -04:00
..
openstack-kollacli.spec	Merge branch 'o3l_2.next'	2016-03-18 14:10:45 -04:00