From 2c832c736f026be4d2d5440e1bd44459b2a868aa Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Mon, 16 Jan 2017 10:20:00 -0600 Subject: New release v2.1.4.0-1 --- RELEASES.txt | 2 ++ 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(+), 3 deletions(-) diff --git a/RELEASES.txt b/RELEASES.txt index cb80aaed42..89a1bc3ddd 100644 --- a/RELEASES.txt +++ b/RELEASES.txt @@ -4,7 +4,9 @@ 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.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" diff --git a/VERSION b/VERSION index b847e94449..aef7cd850c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.4.0 0.3.rc3 +2.1.4.0 1 diff --git a/lib/ansible/modules/core b/lib/ansible/modules/core index b0ffb54b5e..6a5ca970aa 160000 --- a/lib/ansible/modules/core +++ b/lib/ansible/modules/core @@ -1 +1 @@ -Subproject commit b0ffb54b5e3b4b769858f38d4855c494bbca10ca +Subproject commit 6a5ca970aa93ce856eaae2c06c7a123159541046 diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras index ec7247d066..a1f1251eb8 160000 --- a/lib/ansible/modules/extras +++ b/lib/ansible/modules/extras @@ -1 +1 @@ -Subproject commit ec7247d066807f0b96e7b3f9533910bda28bb37e +Subproject commit a1f1251eb8f402f571e0b6266f7531af7ee4d9d5 diff --git a/packaging/debian/changelog b/packaging/debian/changelog index f54731fddf..23860d950f 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.4.0) unstable; urgency=low + + * 2.1.4.0 + + -- Ansible, Inc. Mon, 16 Jan 2017 10:19:57 -0600 + + ansible (2.1.3.0) unstable; urgency=low * 2.1.3.0 diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index a54de14a7e..15f9c8d8ce 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. - 2.1.4.0-1 +- Release 2.1.4.0-1 + * Fri Nov 04 2016 Ansible, Inc. - 2.1.3.0-1 - Release 2.1.3.0-1 -- cgit v1.2.1