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

Conflicts:
	lib/ansible/constants.py
This commit is contained in:
Michael DeHaan 2013-10-07 08:39:23 -04:00
commit 65178290e7
3 changed files with 16 additions and 9 deletions

View file

@ -104,9 +104,12 @@ filter_plugins = /usr/share/ansible_plugins/filter_plugins
# uncomment this line to cause the paramiko connection plugin to not record new host
# keys encountered. Increases performance on new host additions. Setting works independently of the
# host key checking setting above.
#record_host_keys=False
# by default, Ansible requests a pseudo-terminal for commands executed under sudo. Uncomment this
# line to disable this behaviour.
#pty=False
[ssh_connection]
# ssh arguments to use