summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RELEASES.txt3
-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, 13 insertions, 2 deletions
diff --git a/RELEASES.txt b/RELEASES.txt
index cb4b025ebc..bbdd411432 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -4,7 +4,8 @@ Ansible Releases at a Glance
VERSION RELEASE CODE NAME
++++++++++++++++++++++++++++++
-2.2.0 TBD "TBD"
+2.2.0 TBD "The Battle of Evermore"
+2.1.2 TBD "The Song Remains the Same"
2.1.1 07-28-2016 "The Song Remains the Same"
2.1.0 05-25-2016 "The Song Remains the Same"
2.0.2 04-19-2016 "Over the Hills and Far Away"
diff --git a/VERSION b/VERSION
index ec8bf618ec..db1e74d6a5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.2.0 0.5.rc5
+2.1.2.0 1
diff --git a/lib/ansible/modules/core b/lib/ansible/modules/core
-Subproject ba2ecc95542f0ed1bcc6d7e3422d7c101957180
+Subproject 17ee1cfaf960d99bd3fee7631f86b1013957ec7
diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras
-Subproject 9fa6b1e9288ac19dae249257d806b38a477db28
+Subproject d312f34d9bbb722bf13314102d7373f1bd82e43
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 632a706b7d..1db98f7503 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -4,6 +4,13 @@ ansible (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low
-- Ansible, Inc. <support@ansible.com> %DATE%
+ansible (2.1.2.0) unstable; urgency=low
+
+ * 2.1.2.0
+
+ -- Ansible, Inc. <support@ansible.com> Thu, 29 Sep 2016 10:01:34 -0500
+
+
ansible (2.1.1.0) unstable; urgency=low
* 2.1.1.0
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 4898e721c6..fc883ffb55 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Sep 29 2016 Ansible, Inc. <support@ansible.com> - 2.1.2.0-1
+- Release 2.1.2.0-1
+
* Thu Jul 28 2016 Ansible, Inc. <support@ansible.com> - 2.1.1.0-1
- Release 2.1.1.0-1