Merge branch 'ec2_nested_groups' of https://github.com/cchurch/ansible into cchurch-ec2_nested_groups

Conflicts:
	plugins/inventory/ec2.py
This commit is contained in:
James Cammarata
2014-07-31 13:07:31 -05:00
2 changed files with 69 additions and 15 deletions

View File

@@ -61,3 +61,6 @@ cache_path = ~/.ansible/tmp
# seconds, a new API call will be made, and the cache file will be updated.
# To disable the cache, set this value to 0
cache_max_age = 300
# Organize groups into a nested/hierarchy instead of a flat namespace.
nested_groups = False