From cc4129f6a11d1de89a2eb83991c05adc3e4a8723 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Wed, 25 Jun 2014 14:20:46 -0500
Subject: [PATCH] Version bump for 1.6.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c07d96c04e..834a91ba4e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Ansible Changes By Release
 ==========================
 
+## 1.6.4 "And the Cradle Will Rock" - Jun 25, 2014
+
+- Security update to prevent local operations from executing as the result of specifically crafted untrusted data
+
 ## 1.6.3 "And the Cradle Will Rock" - Jun 09, 2014
 
 - Corrects a regression where handlers were run across all hosts, not just those that triggered the handler.
diff --git a/RELEASES.txt b/RELEASES.txt
index fc89cf08e81..3b40f690b2a 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -6,6 +6,7 @@ Active Development
 
 1.7    "Summer Nights" -------- CURRENT DEVEL BRANCH
 
+1.6.4  "The Cradle Will Rock" - 06-25-2014
 1.6.3  "The Cradle Will Rock" - 06-09-2014
 1.6.2  "The Cradle Will Rock" - 05-23-2014
 1.6.1  "The Cradle Will Rock" - 05-07-2014
diff --git a/VERSION b/VERSION
index 266146b87cb..9edc58bb1dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.3
+1.6.4
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index e5dada285d1..c144d454dae 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.3'
+__version__ = '1.6.4'
 __author__ = 'Michael DeHaan'
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 38573dbb9dc..5933539e81d 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+ansible (1.6.4) unstable; urgency=low
+
+  * 1.6.4 release
+
+ -- Michael DeHaan <michael@ansible.com>  Wed, 25 Jun 2014 17:30:00 -0500
+
 ansible (1.6.3) unstable; urgency=low
 
   * 1.6.3 release
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 775047aa727..114b2154c36 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -115,6 +115,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Wed Jun 25 2014 Michael DeHaan <michael@ansible.com> - 1.6.4
+- Release 1.6.4
+
 * Mon Jun 09 2014 Michael DeHaan <michael@ansible.com> - 1.6.3
 - Release 1.6.3