Update the changelog

2 files changed, 11 insertions, 72 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74ee524cce..3fcd7e38d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Ansible Changes By Release
 ==========================
 
+1.2.1 "Hear About It Later" -- July 4, 2013
+
+* Connection default is now "smart", which discovers if the system openssh can support ControlPersist, and uses
+  it if so, if not falls back to paramiko.
+* Host key checking is on by default.  Disable it if you like by adding host_key_checking=False in the [default]
+  section of /etc/ansible/ansible.cfg or ~/ansible.cfg or by exporting ANSIBLE_HOST_KEY_CHECKING=False
+* Paramiko now records host keys it was in contact with host key checking is on.  It is somewhat sluggish when doing this, 
+  so switch to the 'ssh' transport if this concerns you.
+
 1.2 "Right Now" -- June 10, 2013
 
 Core Features:
diff --git a/examples/ansible.cfg b/examples/ansible.cfg
index 58e86d94e0..9d602b25aa 100644
--- a/examples/ansible.cfg
+++ b/examples/ansible.cfg
@@ -8,11 +8,8 @@
 
 hostfile = /etc/ansible/hosts
 
-<<<<<<< HEAD
 # location of ansible library, eliminates need to specify --module-path
-
-library = /usr/share/ansible
-=======
+library        = /usr/share/ansible
 hostfile       = /etc/ansible/hosts
 library        = /usr/share/ansible
 remote_tmp     = $HOME/.ansible/tmp
@@ -24,79 +21,12 @@ sudo_user      = root
 #ask_pass      = True
 transport      = smart
 remote_port    = 22
->>>>>>> c55adc9... Default to 'smart' transport, which will use OpenSSH if it can support ControlPersist.
 
 # uncomment this to disable SSH key host checking
 #host_key_checking = False
 
-# change this for alternative sudo implementations
-sudo_exe = sudo
-
-# default module name used in /usr/bin/ansible when -m is not specified
-
 module_name = command
 
-# location for ansible log file.  If set, will store output from ansible 
-# and ansible-playbook.  If enabling, you may wish to configure
-# logrotate.
-
-#log_path = /var/log/ansible.log
-
-# home directory where temp files are stored on remote systems.  Should
-# almost always contain $HOME or be a directory writeable by all users
-
-remote_tmp = $HOME/.ansible/tmp
-
-# the default pattern for ansible-playbooks ("hosts:")
-
-pattern = *
-
-# the default number of forks (parallelism) to be used.  Usually you
-# can crank this up.
-
-forks=5
-
-# the timeout used by various connection types.  Usually this corresponds
-# to an SSH timeout
-
-timeout=10
-
-# when using --poll or "poll:" in an ansible playbook, and not specifying
-# an explicit poll interval, use this interval
-
-poll_interval=15
-
-# when specifying --sudo to /usr/bin/ansible or "sudo:" in a playbook,
-# and not specifying "--sudo-user" or "sudo_user" respectively, sudo
-# to this user account
-
-sudo_user=root
-
-# the following forces ansible to always ask for the sudo password (instead of having
-# to add -K to the commandline). Or you can use the environment variable (ANSIBLE_ASK_SUDO_PASS)
-
-#ask_sudo_pass=True
-
-# the following forces ansible to always ask for the ssh-password (-k)
-# can also be set by the environment variable ANSIBLE_ASK_PASS
-
-#ask_pass=True
-
-# connection to use when -c <connection_type> is not specified
-
-transport=paramiko
-
-# remote SSH port to be used when --port or "port:" or an equivalent inventory
-# variable is not specified.
-
-remote_port=22
-
-# if set, always run /usr/bin/ansible commands as this user, and assume this value
-# if "user:" is not set in a playbook.  If not set, use the current Unix user
-# as the default
-
-#remote_user=root
-
 # the default sudo executable. If a sudo alternative with a sudo-compatible interface
 # is used, specify its executable name as the default
 
@@ -172,7 +102,7 @@ filter_plugins     = /usr/share/ansible_plugins/filter_plugins
 # will result in poor performance, so use transport=paramiko on older platforms rather than
 # removing it
 
-ssh_args=-o ControlMaster=auto -o ControlPersist=60s -o ControlPath=/tmp/ansible-ssh-%h-%p-%r
+ssh_args=#-o ControlMaster=auto -o ControlPersist=60s -o ControlPath=/tmp/ansible-ssh-%h-%p-%r
 
 # the following makes ansible use scp if the connection type is ssh (default is sftp)