James Cammarata d77a6965b3 Merge module_vars into inject during template instead of updating ... This way we won't overwrite values that are stored in the inject with module_vars that should be lower precedence. Fixes #7510		2014-05-23 13:36:45 -05:00
..
callback_plugins	Update various copyrights. Not complete, but sufficient.	2014-01-04 13:32:04 -05:00
inventory	Fixed extension filtering in InventoryDirectory	2014-05-14 23:43:14 -07:00
module_utils	Also set the environment variables when resetting the locale to C	2014-05-19 23:22:46 -05:00
playbook	Don't re-query inventory when trimming failed/dark hosts	2014-05-20 14:58:37 -05:00
runner	Merge module_vars into inject during template instead of updating	2014-05-23 13:36:45 -05:00
utils	Merge pull request #7388 from jimi-c/issue_7384_vars_files_include	2014-05-14 14:52:33 -05:00
__init__.py	Version bump for 1.7	2014-05-05 16:37:46 -05:00
callbacks.py	fix UnicodeEncodeError when prompt is unicode.	2014-05-21 23:43:19 +09:00
color.py	Merge commit.	2014-03-16 17:08:26 -04:00
constants.py	Adding a new system_warnings config option to supress warnings	2014-04-30 14:44:10 -05:00
errors.py	Update various copyrights. Not complete, but sufficient.	2014-01-04 13:32:04 -05:00
module_common.py	Modify the way we set the localization environment	2014-05-01 10:34:53 -05:00