From 29f2f26278f4899094cd393ebf08fffc7cd9aee9 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 29 Sep 2016 10:01:35 -0500 Subject: [PATCH] New release v2.1.2.0-1 --- RELEASES.txt | 3 ++- VERSION | 2 +- lib/ansible/modules/core | 2 +- lib/ansible/modules/extras | 2 +- packaging/debian/changelog | 7 +++++++ packaging/rpm/ansible.spec | 3 +++ 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/RELEASES.txt b/RELEASES.txt index cb4b025ebc5..bbdd4114329 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 ec8bf618ece..db1e74d6a57 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 index ba2ecc95542..17ee1cfaf96 160000 --- a/lib/ansible/modules/core +++ b/lib/ansible/modules/core @@ -1 +1 @@ -Subproject commit ba2ecc95542f0ed1bcc6d7e3422d7c1019571805 +Subproject commit 17ee1cfaf960d99bd3fee7631f86b1013957ec70 diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras index 9fa6b1e9288..d312f34d9bb 160000 --- a/lib/ansible/modules/extras +++ b/lib/ansible/modules/extras @@ -1 +1 @@ -Subproject commit 9fa6b1e9288ac19dae249257d806b38a477db281 +Subproject commit d312f34d9bbb722bf13314102d7373f1bd82e433 diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 632a706b7d6..1db98f75037 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -4,6 +4,13 @@ ansible (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low -- Ansible, Inc. %DATE% +ansible (2.1.2.0) unstable; urgency=low + + * 2.1.2.0 + + -- Ansible, Inc. 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 4898e721c60..fc883ffb552 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. - 2.1.2.0-1 +- Release 2.1.2.0-1 + * Thu Jul 28 2016 Ansible, Inc. - 2.1.1.0-1 - Release 2.1.1.0-1