summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMichael DeHaan <michael@ansibleworks.com>2013-10-07 14:39:23 +0200
committerMichael DeHaan <michael@ansibleworks.com>2013-10-07 14:39:23 +0200
commit65178290e717d3f04979710a7c18164bcf969a35 (patch)
treec23b6194e91d57dcd7e6f373a0e4ea0db5e2faa0 /examples
parentAdd local provisioning step notes to EC2 pages (adapted with changes by mpdeh... (diff)
parent#4227 in upstream repo (diff)
downloadansible-65178290e717d3f04979710a7c18164bcf969a35.tar.xz
ansible-65178290e717d3f04979710a7c18164bcf969a35.zip
Merge branch 'devel' of git://github.com/nextus/ansible into devel
Conflicts: lib/ansible/constants.py
Diffstat (limited to 'examples')
-rw-r--r--examples/ansible.cfg5
1 files changed, 4 insertions, 1 deletions
diff --git a/examples/ansible.cfg b/examples/ansible.cfg
index 230e1e6a1f..25b58dc1da 100644
--- a/examples/ansible.cfg
+++ b/examples/ansible.cfg
@@ -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