From 4a9f72dccee0d149ad7b7a4cd807c16afc55ea19 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael@ansibleworks.com>
Date: Thu, 4 Jul 2013 22:02:10 -0400
Subject: [PATCH] Merge in release notes from 1.2.1

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46d4f1f45c0..dad573af507 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,15 @@ Misc changes:
 * added termination support to ec2 module
 * --ask-sudo-pass or --sudo-user does not enable all options to use sudo in ansible-playbook
 
+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: