Michael DeHaan 8c4161d4a1 Merge branch 'retf_py' of git://github.com/berendt/ansible into devel ...

Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	plugins/callbacks/mail.py

2014-08-08 12:17:37 -04:00

..

vars_plugins

Allow empty yaml vars files

2014-07-04 23:10:32 -05:00

__init__.py

Merge branch 'retf_py' of git://github.com/berendt/ansible into devel

2014-08-08 12:17:37 -04:00

dir.py

InventoryDir: fixing yet another corner case

2014-08-08 08:54:11 +02:00

expand_hosts.py

fixed typos found by RETF rules in PY files

2014-05-03 18:40:05 +02:00

group.py

Merge branch 'inventory_refactoring' into svg_and_inventory_refactor

2014-07-07 13:11:58 -05:00

host.py

Allow hash_behaviour=merge to be respected in core inventory

2014-03-11 12:49:54 +01:00

ini.py

inventory ini parser: do not add all the groups to *all* group

2014-03-25 12:45:00 +01:00

script.py

Merge branch 'sergevanginderachter-inventorytree' into svg_and_inventory_refactor

2014-07-07 13:11:52 -05:00