Merge branch 'nocows' of git://github.com/jpmens/ansible into devel

Conflicts:
	lib/ansible/callbacks.py
	lib/ansible/constants.py
This commit is contained in:
Michael DeHaan
2013-04-27 11:34:39 -04:00
3 changed files with 9 additions and 2 deletions

View File

@@ -131,6 +131,10 @@ lookup_plugins = /usr/share/ansible_plugins/lookup_plugins
vars_plugins = /usr/share/ansible_plugins/vars_plugins
filter_plugins = /usr/share/ansible_plugins/filter_plugins
# set to 1 if you don't want cowsay support. Alternatively, set ANSIBLE_NOCOWS=1
# in your environment
# nocows = 1
[paramiko_connection]
# nothing to configure yet