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 834a91ba4e..cb7f12301c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
Ansible Changes By Release
==========================
+## 1.6.5 "And the Cradle Will Rock" - Jun 25, 2014
+
+- Additional tweaks to prevent the incorrect execution of untrusted data
+
## 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
diff --git a/RELEASES.txt b/RELEASES.txt
index 3b40f690b2..cc7ea436d1 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -6,6 +6,7 @@ Active Development
1.7 "Summer Nights" -------- CURRENT DEVEL BRANCH
+1.6.5 "The Cradle Will Rock" - 06-25-2014
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
diff --git a/VERSION b/VERSION
index 9edc58bb1d..9f05f9f2ce 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.4
+1.6.5
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index c144d454da..a891cb7e7d 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.4'
+__version__ = '1.6.5'
__author__ = 'Michael DeHaan'
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 5933539e81..05adb9f3eb 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+ansible (1.6.5) unstable; urgency=low
+
+ * 1.6.5 release
+
+ -- Michael DeHaan <michael@ansible.com> Wed, 25 Jun 2014 22:30:00 -0500
+
ansible (1.6.4) unstable; urgency=low
* 1.6.4 release
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 114b2154c3..639d0b6143 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.5
+- Release 1.6.5
+
* Wed Jun 25 2014 Michael DeHaan <michael@ansible.com> - 1.6.4
- Release 1.6.4