summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-07-22 16:32:42 -0500
committerJames Cammarata <jimi@sngx.net>2014-07-22 16:32:55 -0500
commitf88bf574630db3daac1318fa7c65465f5d58a964 (patch)
treeaf4b2f708aa776ce1e95f572f540c05b4e585719
parentb35e1a664d574efca2a4f8022fef447bf3e1661e (diff)
downloadansible-f88bf574630db3daac1318fa7c65465f5d58a964.tar.gz
Version bump for release 1.6.8v1.6.8
-rw-r--r--CHANGELOG.md6
-rw-r--r--RELEASES.txt3
-rw-r--r--VERSION2
-rw-r--r--lib/ansible/__init__.py2
-rw-r--r--packaging/debian/changelog8
-rw-r--r--packaging/rpm/ansible.spec5
6 files changed, 20 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e9a2e87f9..f8aa300858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
Ansible Changes By Release
==========================
-## 1.6.7 "And the Cradle Will Rock" - Jul 17, 2014
+## 1.6.8 "And the Cradle Will Rock" - Jul 22, 2014
+
+- Corrects a regression in the way shell and command parameters were being parsed
+
+## 1.6.7 "And the Cradle Will Rock" - Jul 21, 2014
- Security fixes:
* Strip lookup calls out of inventory variables and clean unsafe data
diff --git a/RELEASES.txt b/RELEASES.txt
index f53d66a1cc..d8d8dcefa1 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -6,7 +6,8 @@ Active Development
1.7 "Summer Nights" -------- CURRENT DEVEL BRANCH
-1.6.7 "The Cradle Will Rock" - 07-17-2014
+1.6.8 "The Cradle Will Rock" - 07-22-2014
+1.6.7 "The Cradle Will Rock" - 07-21-2014
1.6.6 "The Cradle Will Rock" - 07-01-2014
1.6.5 "The Cradle Will Rock" - 06-25-2014
1.6.4 "The Cradle Will Rock" - 06-25-2014
diff --git a/VERSION b/VERSION
index 400084b1bf..d8c5e721a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.7
+1.6.8
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index 8908ca3f93..3d6d8492e5 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.7'
+__version__ = '1.6.8'
__author__ = 'Michael DeHaan'
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index a3fc1124fa..f73d901439 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,8 +1,14 @@
+ansible (1.6.8) unstable; urgency=low
+
+ * 1.6.8 release
+
+ -- Michael DeHaan <michael@ansible.com> Tue, 22 Jul 2014 17:30:00 -0500
+
ansible (1.6.7) unstable; urgency=low
* 1.6.7 release
- -- Michael DeHaan <michael@ansible.com> Thu, 17 Jul 2014 10:30:00 -0500
+ -- Michael DeHaan <michael@ansible.com> Mon, 21 Jul 2014 12:30:00 -0500
ansible (1.6.6) unstable; urgency=low
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 2afc777480..c0b9bfe23c 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -115,7 +115,10 @@ rm -rf %{buildroot}
%changelog
-* Thu Jul 17 2014 Michael DeHaan <michael@ansible.com> - 1.6.7
+* Tue Jul 22 2014 Michael DeHaan <michael@ansible.com> - 1.6.8
+- Release 1.6.8
+
+* Mon Jul 21 2014 Michael DeHaan <michael@ansible.com> - 1.6.7
- Release 1.6.7
* Tue Jul 01 2014 Michael DeHaan <michael@ansible.com> - 1.6.6