From ce4883bcc552eda82858de1bf282dd7719d1e3ad Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Fri, 23 May 2014 15:37:57 -0500
Subject: [PATCH] Version bump for 1.6.2

---
 CHANGELOG.md               | 12 ++++++++++++
 RELEASES.txt               |  1 +
 VERSION                    |  2 +-
 lib/ansible/__init__.py    |  2 +-
 packaging/debian/changelog |  6 ++++++
 packaging/rpm/ansible.spec |  6 +++++-
 6 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81908babe8e..c212963ef44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,18 @@
 Ansible Changes By Release
 ==========================
 
+## 1.6.2 "And the Cradle Will Rock" - May 23, 2014
+ 
+- If an improper locale is specified, core modules will now automatically revert to using the 'C' locale.
+- Modules using the fetch_url utility will now obey proxy environment variables.
+- The SSL validation step in fetch_url will likewise obey proxy settings, however only proxies using the http protocol are supported.
+- Fixed multiple bugs in docker module related to version changes upstream.
+- Fixed a bug in the ec2_group module where egress rules were lost when a VPC was specified.
+- Fixed two bugs in the synchronize module:
+  * a trailing slash might be lost when calculating relative paths, resulting in an incorrect destination.
+  * the sync might use the inventory directory incorrectly instead of the playbook or role directory.
+- Files will now only be chown'd on an atomic move if the src/dest uid/gid do not match.
+
 ## 1.6.1 "And the Cradle Will Rock" - May 7, 2014
 
 - Fixed a bug in group_by, where systems were being grouped incorrectly.
diff --git a/RELEASES.txt b/RELEASES.txt
index eb60e9b6854..8863964c439 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -6,6 +6,7 @@ Active Development
 
 1.7    "Summer Nights" -------- CURRENT DEVEL BRANCH
 
+1.6.2  "The Cradle Will Rock" - 05-23-2014
 1.6.1  "The Cradle Will Rock" - 05-07-2014
 1.6    "The Cradle Will Rock" - 05-05-2014
 1.5.5  "Love Walks In" -------- 04-18-2014
diff --git a/VERSION b/VERSION
index 9c6d6293b1a..fdd3be6df54 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.1
+1.6.2
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index b054f9d4302..14c6b5b5663 100644
--- a/lib/ansible/__init__.py
+++ b/lib/ansible/__init__.py
@@ -14,5 +14,5 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-__version__ = '1.6.1'
+__version__ = '1.6.2'
 __author__ = 'Michael DeHaan'
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index b6bf0735614..8d3f97ba962 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+ansible (1.6.2) unstable; urgency=low
+
+  * 1.6.2 release
+
+ -- Michael DeHaan <michael.dehaan@gmail.com>  Fri, 23 May 2014 17:30:00 -0500
+
 ansible (1.6.1) unstable; urgency=low
 
   * 1.6.1 release
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 95b9c2f5404..ef84a4cbc2e 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -1,11 +1,12 @@
 %define name ansible
+%define ansible_version $VERSION
 
 %if 0%{?rhel} == 5
 %define __python /usr/bin/python26
 %endif
 
 Name:      %{name}
-Version:   1.6.1
+Version:   %{ansible_version}
 Release:   1%{?dist}
 Url:       http://www.ansible.com
 Summary:   SSH-based application deployment, configuration management, and IT orchestration platform
@@ -114,6 +115,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Fri May 23 2014 Michael DeHaan <michael@ansible.com> - 1.6.2
+- Release 1.6.2
+
 * Wed May 07 2014 Michael DeHaan <michael@ansible.com> - 1.6.1
 - Release 1.6.1