From 39ce8c6610ecaa1a5f992f76d4f868b2cce8fd39 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Mon, 27 Mar 2017 13:46:04 -0500 Subject: [PATCH] New release v2.1.5.0-1 --- RELEASES.txt | 4 ++++ VERSION | 2 +- lib/ansible/modules/core | 2 +- lib/ansible/modules/extras | 2 +- packaging/debian/changelog | 7 +++++++ packaging/rpm/ansible.spec | 3 +++ 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/RELEASES.txt b/RELEASES.txt index 89a1bc3dddc..21fbd45fd63 100644 --- a/RELEASES.txt +++ b/RELEASES.txt @@ -4,8 +4,12 @@ Ansible Releases at a Glance VERSION RELEASE CODE NAME ++++++++++++++++++++++++++++++ +2.4.0 TBD "Dancing Days" +2.3.0 TBD "Ramble On" +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.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" 2.1.2 09-29-2016 "The Song Remains the Same" diff --git a/VERSION b/VERSION index 46cc219f354..4dbfd45e08e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.5.0 0.2.rc2 +2.1.5.0 1 diff --git a/lib/ansible/modules/core b/lib/ansible/modules/core index 649627f64d6..0d7f7b79dc3 160000 --- a/lib/ansible/modules/core +++ b/lib/ansible/modules/core @@ -1 +1 @@ -Subproject commit 649627f64d6f82cce0e94cfd4bd166967915ebf4 +Subproject commit 0d7f7b79dc375e1547dbe076c0325efc56809b90 diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras index f73e29fb5c3..8bba10e905a 160000 --- a/lib/ansible/modules/extras +++ b/lib/ansible/modules/extras @@ -1 +1 @@ -Subproject commit f73e29fb5c36d4bc21e60385cc53345efd2baa27 +Subproject commit 8bba10e905aab1e5db7aef59ac046e4c49747bde diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 23860d950fe..2f57f333f27 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.5.0) unstable; urgency=low + + * 2.1.5.0 + + -- Ansible, Inc. Mon, 27 Mar 2017 13:46:02 -0500 + + ansible (2.1.4.0) unstable; urgency=low * 2.1.4.0 diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 15f9c8d8ce9..61d1df90353 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -125,6 +125,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 27 2017 Ansible, Inc. - 2.1.5.0-1 +- Release 2.1.5.0-1 + * Mon Jan 16 2017 Ansible, Inc. - 2.1.4.0-1 - Release 2.1.4.0-1