ansible/lib/ansible
James Cammarata 2bad888f28 Merge branch 'v2_final' into devel_switch_v2
Conflicts:
	lib/ansible/inventory/__init__.py
	lib/ansible/modules/core
	lib/ansible/utils/__init__.py
	lib/ansible/utils/module_docs.py
2015-05-28 15:26:03 -05:00
..
cli Fixing broken set_extra_vars method after fixing unit tests (v2) 2015-05-15 10:45:55 -05:00
compat Making the switch to v2 2015-05-03 21:47:26 -05:00
config Making the switch to v2 2015-05-03 21:47:26 -05:00
errors Making the switch to v2 2015-05-03 21:47:26 -05:00
executor Adding unit tests for ConnectionInformation (v2) 2015-05-22 03:32:40 -05:00
galaxy Making the switch to v2 2015-05-03 21:47:26 -05:00
inventory Merge branch 'v2_final' into devel_switch_v2 2015-05-28 15:26:03 -05:00
module_utils Merge branch 'v2_final' into devel_switch_v2 2015-05-28 15:26:03 -05:00
modules Merge branch 'v2_final' into devel_switch_v2 2015-05-28 15:26:03 -05:00
new_inventory Making the switch to v2 2015-05-03 21:47:26 -05:00
parsing Fixing bugs related to parsing and fixing up parsing integration tests (v2) 2015-05-13 11:27:12 -05:00
playbook Fix logic error in parent attribute retrieval for blocks/roles (v2) 2015-05-12 15:08:35 -05:00
plugins added equivalent of #9636 to v2 2015-05-26 11:55:52 -04:00
template More template unit tests for v2 2015-05-17 01:06:02 -05:00
utils Merge branch 'v2_final' into devel_switch_v2 2015-05-28 15:26:03 -05:00
vars Cleaning up VariableManager tests (v2) 2015-05-14 20:10:31 -05:00
__init__.py Re-adding submodules after moving things around 2015-05-03 22:30:51 -05:00
constants.py removed duplicate retry config entries 2015-05-25 11:06:04 -04:00
test-requirements.txt Making the switch to v2 2015-05-03 21:47:26 -05:00