summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2017-01-16 10:20:00 -0600
committerJames Cammarata <jimi@sngx.net>2017-01-16 10:20:00 -0600
commit2c832c736f026be4d2d5440e1bd44459b2a868aa (patch)
tree34eef4f577892ae400b8fc9edec28d56eafd8d6d
parent71c8ab6ce8e97b9f8ac84e2cf6bfa7a58b44bb94 (diff)
downloadansible-2.1.4.0-1.tar.gz
New release v2.1.4.0-1v2.1.4.0-1
-rw-r--r--RELEASES.txt2
-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, 1 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
-Subproject b0ffb54b5e3b4b769858f38d4855c494bbca10c
+Subproject 6a5ca970aa93ce856eaae2c06c7a12315954104
diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras
-Subproject ec7247d066807f0b96e7b3f9533910bda28bb37
+Subproject a1f1251eb8f402f571e0b6266f7531af7ee4d9d
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. <info@ansible.com> %DATE%
+ansible (2.1.4.0) unstable; urgency=low
+
+ * 2.1.4.0
+
+ -- Ansible, Inc. <info@ansible.com> 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. <info@ansible.com> - 2.1.4.0-1
+- Release 2.1.4.0-1
+
* Fri Nov 04 2016 Ansible, Inc. <info@ansible.com> - 2.1.3.0-1
- Release 2.1.3.0-1