Michael DeHaan 7c6341718e Merge branch 'combine_vars' of git://github.com/laggyluke/ansible into exp ...

Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	lib/ansible/runner/__init__.py
	lib/ansible/utils/__init__.py
	test/TestPlayBook.py

2013-04-16 20:06:06 -04:00

..

__init__.py

Make group_vars and host_vars available to usr/bin/ansible, and make vars_plugins exist

2012-10-26 19:55:59 -04:00

group_vars.py

Merge branch 'combine_vars' of git://github.com/laggyluke/ansible into exp

2013-04-16 20:06:06 -04:00