Commit Graph

2 Commits (c819d56adafb79a75f188e8e4b6b4d24586f194a)

Author SHA1 Message Date
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
11 years ago
James Cammarata ce3ef7f4c1 Making the switch to v2 11 years ago