Merge branch 'yaml-inventory' of https://github.com/jhoekx/ansible into jhoekx-yaml-inventory
Conflicts: lib/ansible/runner.py
Showing
lib/ansible/inventory.py
0 → 100644
This diff is collapsed.
Click to expand it.
test/TestInventory.py
0 → 100644
test/inventory_api.py
0 → 100644
test/simple_hosts
0 → 100644
test/yaml_hosts
0 → 100644
Please
register
or
sign in
to comment