summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael DeHaan <michael@ansibleworks.com>2013-06-10 15:34:52 -0400
committerMichael DeHaan <michael@ansibleworks.com>2013-06-10 15:34:52 -0400
commit404b082d82ba53b28cc2ac32644309aaef75f437 (patch)
treeec55447a576389c73bd7bf0816f38bbccf19103c
parentf67c13f8f10a6f8e0343a3c3d4e8ad7737ed28ab (diff)
downloadansible-404b082d82ba53b28cc2ac32644309aaef75f437.tar.gz
Version bump and assorted things to start new development version.
-rw-r--r--CHANGELOG.md4
-rw-r--r--RELEASES.txt21
-rw-r--r--VERSION2
-rw-r--r--lib/ansible/__init__.py4
-rw-r--r--packaging/rpm/ansible.spec5
5 files changed, 22 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74ee524cce..67498069a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
Ansible Changes By Release
==========================
+1.3 "Top of the World" - Release pending!
+
+* This is the active development release, right now!
+
1.2 "Right Now" -- June 10, 2013
Core Features:
diff --git a/RELEASES.txt b/RELEASES.txt
index d20d79e30a..76f5de0681 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -1,16 +1,17 @@
Ansible Releases at a Glance
============================
-1.2 "Right Now" ------- pending
-1.1 "Mean Street" ----- 04-02-2013
-1.0 "Eruption" -------- 02-01-2013
-0.9 "Dreams" ---------- 11-30-2012
-0.8 "Cathedral" ------- 10-19-2012
-0.7 "Panama" ---------- 09-06-2012
-0.6 "Cabo" ------------ 08-06-2012
-0.5 "Amsterdam" ------- 07-04-2012
-0.4 "Unchained" ------- 05-23-2012
-0.3 "Baluchitherium" -- 04-23-2012
+1.3 "Top of the World" -- pending
+1.2 "Right Now" --------- 06-10-2013
+1.1 "Mean Street" ------- 04-02-2013
+1.0 "Eruption" ---------- 02-01-2013
+0.9 "Dreams" ------------ 11-30-2012
+0.8 "Cathedral" --------- 10-19-2012
+0.7 "Panama" ------------ 09-06-2012
+0.6 "Cabo" -------------- 08-06-2012
+0.5 "Amsterdam" --------- 07-04-2012
+0.4 "Unchained" --------- 05-23-2012
+0.3 "Baluchitherium" ---- 04-23-2012
0.0.2 Untitled
0.0.1 Untitled
diff --git a/VERSION b/VERSION
index 5625e59da8..7e32cd5698 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2
+1.3
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index 90de3bc537..1bd3757922 100644
--- a/lib/ansible/__init__.py
+++ b/lib/ansible/__init__.py
@@ -1,4 +1,4 @@
-# (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
+# (c) 2012-2013, Michael DeHaan <michael.dehaan@gmail.com>
#
# This file is part of Ansible
#
@@ -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.2'
+__version__ = '1.3'
__author__ = 'Michael DeHaan'
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index e7bc3ab1fa..720796e263 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -6,7 +6,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Name: ansible
Release: 1%{?dist}
Summary: SSH-based configuration management, deployment, and orchestration engine
-Version: 1.2
+Version: 1.3
Group: Development/Libraries
License: GPLv3
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jun 10 2013 Michael DeHaan <michael.dehaan@gmail.com> - 1.3-0
+* (release pending)
+
* Mon Jun 10 2013 Michael DeHaan <michael.dehaan@gmail.com> - 1.2-0
* Release 1.2