Toshio Kuratomi aeff960d02 Cleanup combine_vars ... * Dedupe combine_vars() code (removed from VariableManager) * Fix merge_hash algorithm to preserve the type * unittest combine_vars and merge_hash		2015-09-01 11:23:12 -07:00
..
errors	Making the switch to v2	2015-05-03 21:47:26 -05:00
executor	Fix unit tests broken by 057712c1	2015-08-28 16:44:04 -04:00
inventory_test_data/group_vars	Merge branch 'v2_final' into devel_switch_v2	2015-05-28 15:26:03 -05:00
mock	Restore the relative path handling portion of #11865	2015-08-06 07:28:22 -07:00
module_utils	Use 0oNNN octal syntax in test/	2015-08-27 22:15:57 +03:00
parsing	Update Vault tests to make sure AES decryption works	2015-08-27 18:36:05 +05:30
playbook	changed no_log expected type to new value	2015-08-25 10:20:47 -04:00
plugins	Fix a parsing bug that prevents IPv6 addresses from being used with `add_host`	2015-08-23 22:50:47 +05:30
template	Fix backslash escaping inside of jinja2 expressions	2015-08-31 13:17:26 -07:00
utils	Cleanup combine_vars	2015-09-01 11:23:12 -07:00
vars	Cleanup combine_vars	2015-09-01 11:23:12 -07:00
__init__.py	Making the switch to v2	2015-05-03 21:47:26 -05:00