Merge branch 'devel' into v2_final

Browse Source

Conflicts:
	lib/ansible/modules/core
	v2/ansible/modules/core
	v2/ansible/modules/extras

...

This commit is contained in:

James Cammarata

2015-05-04 16:35:11 -05:00

parent 803fb397f3 99909b08ba

commit 8f504dacdd

33 changed files with 1423 additions and 41 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

lib/ansible/modules/core

Submodule lib/ansible/modules/core updated: 0341ddd35e...85c8a892c8

2

lib/ansible/modules/extras

Submodule lib/ansible/modules/extras updated: 495ad450e5...2690f096a4