summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2017-01-16 10:13:31 -0600
committerJames Cammarata <jimi@sngx.net>2017-01-16 10:13:31 -0600
commit53629100006d1d8eebe3447235f8b4bf048a3dc0 (patch)
tree940b57ad9288edfc62c7e3436dafcae7478bb1ec
parent009ac7b65e029a5fad562d6a644e28c5cbbd04e6 (diff)
downloadansible-53629100006d1d8eebe3447235f8b4bf048a3dc0.tar.gz
New release v2.2.1.0-1v2.2.1.0-1
-rw-r--r--RELEASES.txt6
-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, 3 deletions
diff --git a/RELEASES.txt b/RELEASES.txt
index 871cadb7a6..89a1bc3ddd 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -4,8 +4,10 @@ Ansible Releases at a Glance
VERSION RELEASE CODE NAME
++++++++++++++++++++++++++++++
+2.2.1 01-16-2017 "The Battle of Evermore"
2.2.0 11-01-2016 "The Battle of Evermore"
-2.1.3 TBD "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"
2.1.2 09-29-2016 "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"
@@ -23,7 +25,7 @@ VERSION RELEASE CODE NAME
1.8.3 02-17-2015 "You Really Got Me"
1.8.2 12-04-2014 "You Really Got Me"
1.8.1 11-26-2014 "You Really Got Me"
-1.8.0 ? "You Really Got Me"
+1.8.0 11-25-2014 "You Really Got Me"
1.7.2 09-24-2014 "Summer Nights"
1.7.1 08-14-2014 "Summer Nights"
1.7.0 08-06-2014 "Summer Nights"
diff --git a/VERSION b/VERSION
index aa2044facd..0ee313960d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.1.0 0.5.rc5
+2.2.1.0 1
diff --git a/lib/ansible/modules/core b/lib/ansible/modules/core
-Subproject b387c9c1e29314ddd02c72a753c6c45ae2b8bb9
+Subproject 7e8bb413b79f3b74634e4e56931d832aea83470
diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras
-Subproject e9bf9fd844d9d340c90d813ca58be62dce6f354
+Subproject c501e006ea5840af91396c6a3f76851cbad5b93
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 0996063056..ed55663b30 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.2.1.0) unstable; urgency=low
+
+ * 2.2.1.0
+
+ -- Ansible, Inc. <info@ansible.com> Mon, 16 Jan 2017 10:13:29 -0600
+
+
ansible (2.2.0.0) unstable; urgency=low
* 2.2.0.0
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 4c9c7a3452..50217ce272 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jan 16 2017 Ansible, Inc. <info@ansible.com> - 2.2.1.0-1
+- Release 2.2.1.0-1
+
* Mon Oct 31 2016 Ansible, Inc. <info@ansible.com> - 2.2.0.0-1
- Release 2.2.0.0-1