From d4e11c5c694a2ddb7079a5bab40af13e874c580c Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Wed, 7 May 2014 12:33:07 -0500
Subject: [PATCH] Version bump for 1.6.1 release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 353a85d0cad..81908babe8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,14 @@
 Ansible Changes By Release
 ==========================
 
-## 1.6 "And the Cradle Will Rock"
+## 1.6.1 "And the Cradle Will Rock" - May 7, 2014
+
+- Fixed a bug in group_by, where systems were being grouped incorrectly.
+- Fixed a bug where file descriptors may leak to a child process when using accelerate.
+- Fixed a bug in apt_repository triggered when python-apt not being installed/available.
+- Fixed a bug in the apache2_module module, where modules were not being disabled correctly.
+
+## 1.6 "And the Cradle Will Rock" - May 5, 2014
 
 Major features/changes:
 
diff --git a/RELEASES.txt b/RELEASES.txt
index e030c243233..eb60e9b6854 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -6,6 +6,7 @@ Active Development
 
 1.7    "Summer Nights" -------- CURRENT DEVEL BRANCH
 
+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
 1.5.4  "Love Walks In" -------- 04-01-2014
diff --git a/VERSION b/VERSION
index 810ee4e91e2..9c6d6293b1a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6
+1.6.1
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index 69fb825bda4..b054f9d4302 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'
+__version__ = '1.6.1'
 __author__ = 'Michael DeHaan'
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index b8838e62353..b6bf0735614 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+ansible (1.6.1) unstable; urgency=low
+
+  * 1.6.1 release
+
+ -- Michael DeHaan <michael.dehaan@gmail.com>  Wed, 07 May 2014 13:30:00 -0500
+
 ansible (1.6) unstable; urgency=low
 
   * 1.6.0 release
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 1191c6b4e8a..95b9c2f5404 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:      %{name}
-Version:   1.6
+Version:   1.6.1
 Release:   1%{?dist}
 Url:       http://www.ansible.com
 Summary:   SSH-based application deployment, configuration management, and IT orchestration platform
@@ -114,6 +114,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Wed May 07 2014 Michael DeHaan <michael@ansible.com> - 1.6.1
+- Release 1.6.1
+
 * Mon May 05 2014 Michael DeHaan <michael@ansible.com> - 1.6.0
 - Release 1.6.0