summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Tanner <tanner.jc@gmail.com>2013-11-21 16:33:23 -0500
committerJames Tanner <tanner.jc@gmail.com>2013-11-21 16:33:23 -0500
commit9b991b915420446c3cb26bd9eb0ff65f8e46bce3 (patch)
treec2960139adfb4e6fb91039a75b5ce3ed5f56a7c3
parent2a58c2bbe33236ccfdde9fe7466d8a65956f21a5 (diff)
downloadansible-9b991b915420446c3cb26bd9eb0ff65f8e46bce3.tar.gz
Version bump for 1.5
-rw-r--r--RELEASES.txt1
-rw-r--r--VERSION2
-rw-r--r--lib/ansible/__init__.py2
-rw-r--r--packaging/debian/changelog5
-rw-r--r--packaging/rpm/ansible.spec5
5 files changed, 12 insertions, 3 deletions
diff --git a/RELEASES.txt b/RELEASES.txt
index 4e9178d401..5c46bed881 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -1,6 +1,7 @@
Ansible Releases at a Glance
============================
+1.5 "Love Walks In" -------- active development
1.4 "Could This Be Magic?" - 11-21-2013
1.3.4 "Top of the World" ----- 10-29-2013
1.3.3 "Top of the World" ----- 10-09-2013
diff --git a/VERSION b/VERSION
index c068b2447c..c239c60cba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4
+1.5
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index 7ecc8f4578..7486c49b46 100644
--- a/lib/ansible/__init__.py
+++ b/lib/ansible/__init__.py
@@ -14,5 +14,5 @@
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
-__version__ = '1.4'
+__version__ = '1.5'
__author__ = 'Michael DeHaan'
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index e502ebbed0..9b205b0f1d 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,8 @@
+ansible (1.5) unstable; urgency=low
+
+ * 1.5 release (PENDING)
+
+ -- Michael DeHaan <michael.dehaan@gmail.com> Thu, 21 November 2013 15:00:01 -0500
ansible (1.4) unstable; urgency=low
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 0d6040000d..c0b92193ce 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Name: ansible
Release: 1%{?dist}
Summary: SSH-based configuration management, deployment, and orchestration engine
-Version: 1.4
+Version: 1.5
Group: Development/Libraries
License: GPLv3
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Nov 21 2013 Michael DeHaan <michael.dehaan@gmail.com> - 1.5-0
+* (PENDING)
+
* Thu Nov 21 2013 Michael DeHaan <michael.dehaan@gmail.com> - 1.4-0
* Release 1.4.0