summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--RELEASES.txt1
-rw-r--r--VERSION2
-rw-r--r--lib/ansible/__init__.py2
-rw-r--r--packaging/debian/changelog6
-rw-r--r--packaging/rpm/ansible.spec3
6 files changed, 16 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8aa300858..743bf5a083 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
Ansible Changes By Release
==========================
+## 1.6.9 "And the Cradle Will Rock" - Jul 25, 2014
+
+- Further improvements to module parameter parsing to address additional regressions caused by security fixes
+
## 1.6.8 "And the Cradle Will Rock" - Jul 22, 2014
- Corrects a regression in the way shell and command parameters were being parsed
diff --git a/RELEASES.txt b/RELEASES.txt
index d8d8dcefa1..535b5917f2 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -6,6 +6,7 @@ Active Development
1.7 "Summer Nights" -------- CURRENT DEVEL BRANCH
+1.6.9 "The Cradle Will Rock" - 07-25-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
diff --git a/VERSION b/VERSION
index d8c5e721a7..15d45d4b47 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.8
+1.6.9
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index 3d6d8492e5..cc93d7deed 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.8'
+__version__ = '1.6.9'
__author__ = 'Michael DeHaan'
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index f73d901439..f2dd43028f 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+ansible (1.6.9) unstable; urgency=low
+
+ * 1.6.9 release
+
+ -- Michael DeHaan <michael@ansible.com> Fri, 25 Jul 2014 00:00:00 -0500
+
ansible (1.6.8) unstable; urgency=low
* 1.6.8 release
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index c0b9bfe23c..a468eb9093 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -115,6 +115,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Jul 25 2014 Michael DeHaan <michael@ansible.com> - 1.6.9
+- Release 1.6.9
+
* Tue Jul 22 2014 Michael DeHaan <michael@ansible.com> - 1.6.8
- Release 1.6.8