summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2017-06-01 13:24:23 -0500
committerJames Cammarata <jimi@sngx.net>2017-06-01 13:24:23 -0500
commit7baf994f2c7c9f07adf94ab9fa147cf31cdf738d (patch)
tree2f1adbf1c6e0933aa662e73b199d5b656d72376d
parente06e9b40b70ce7e827e4e2442243034119b5942b (diff)
downloadansible-stable-2.1.tar.gz
New release v2.1.6.0-1v2.1.6.0-1stable-2.1
-rw-r--r--RELEASES.txt5
-rw-r--r--VERSION2
m---------lib/ansible/modules/core0
m---------lib/ansible/modules/extras0
-rw-r--r--packaging/debian/changelog7
-rw-r--r--packaging/rpm/ansible.spec3
6 files changed, 15 insertions, 2 deletions
diff --git a/RELEASES.txt b/RELEASES.txt
index 21fbd45fd6..ebf2a48d9b 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -5,10 +5,13 @@ VERSION RELEASE CODE NAME
++++++++++++++++++++++++++++++
2.4.0 TBD "Dancing Days"
-2.3.0 TBD "Ramble On"
+2.3.1 06-01-2017 "Ramble On"
+2.3.0 04-12-2017 "Ramble On"
+2.2.3 05-09-2017 "The Battle of Evermore"
2.2.2 03-27-2017 "The Battle of Evermore"
2.2.1 01-16-2017 "The Battle of Evermore"
2.2.0 11-01-2016 "The Battle of Evermore"
+2.1.6 06-01-2017 "The Song Remains the Same"
2.1.5 03-27-2017 "The Song Remains the Same"
2.1.4 01-16-2017 "The Song Remains the Same"
2.1.3 11-04-2016 "The Song Remains the Same"
diff --git a/VERSION b/VERSION
index a46e967ce2..32823808e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.6.0 0.1.rc1
+2.1.6.0 1
diff --git a/lib/ansible/modules/core b/lib/ansible/modules/core
-Subproject 9e28ad39c7df8da901180f26352752771f22619
+Subproject 29dfc6a5a14d4f9bda21276d04c492149b81b8b
diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras
-Subproject bbaa417ddaba19d9bf91e0f1be726e703985535
+Subproject 72f961ab96e863ad6bd1ca22fbc04563e783c6c
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 2f57f333f2..cff694afe4 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -4,6 +4,13 @@ ansible (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low
-- Ansible, Inc. <info@ansible.com> %DATE%
+ansible (2.1.6.0) unstable; urgency=low
+
+ * 2.1.6.0
+
+ -- Ansible, Inc. <info@ansible.com> Thu, 01 Jun 2017 13:24:21 -0500
+
+
ansible (2.1.5.0) unstable; urgency=low
* 2.1.5.0
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 61d1df9035..4a59a6da5f 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 01 2017 Ansible, Inc. <info@ansible.com> - 2.1.6.0-1
+- Release 2.1.6.0-1
+
* Mon Mar 27 2017 Ansible, Inc. <info@ansible.com> - 2.1.5.0-1
- Release 2.1.5.0-1