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

..

__init__.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

cartesian.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

consul_kv.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

csvfile.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

dict.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

dig.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

dnstxt.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

env.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

etcd.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

file.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

fileglob.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

first_found.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

flattened.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

indexed_items.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

inventory_hostnames.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

items.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

lines.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

nested.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

password.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

pipe.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

random_choice.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

redis_kv.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

sequence.py

Merge branch 'v2_final' into devel_switch_v2

2015-05-28 15:26:03 -05:00

subelements.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

template.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

together.py

Making the switch to v2

2015-05-03 21:47:26 -05:00

url.py

Making the switch to v2

2015-05-03 21:47:26 -05:00