From aa4ad80bdad922da6474fa904492d74e3336f06f Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 2 Apr 2013 20:47:57 -0400 Subject: [PATCH] Update release version. --- CHANGELOG.md | 6 +++++- VERSION | 2 +- docs/man/man1/ansible-doc.1 | 8 ++++---- docs/man/man1/ansible-playbook.1 | 8 ++++---- docs/man/man1/ansible-pull.1 | 8 ++++---- docs/man/man1/ansible.1 | 8 ++++---- lib/ansible/__init__.py | 2 +- packaging/debian/changelog | 8 +++++++- packaging/rpm/ansible.spec | 5 ++++- 9 files changed, 34 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02cc6b4ff5..08dc074e88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ Ansible Changes By Release ========================== -1.1 "Mean Street" -- Release pending +1.2 "Right Now" -- release pending + +* this is the current development branch + +1.1 "Mean Street" -- 4/2/2013 Core Features diff --git a/VERSION b/VERSION index 9459d4ba2a..5625e59da8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1 +1.2 diff --git a/docs/man/man1/ansible-doc.1 b/docs/man/man1/ansible-doc.1 index 9bf31657bf..16d5759b58 100644 --- a/docs/man/man1/ansible-doc.1 +++ b/docs/man/man1/ansible-doc.1 @@ -2,12 +2,12 @@ .\" Title: ansible-doc .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 02/01/2013 +.\" Date: 04/02/2013 .\" Manual: System administration commands -.\" Source: Ansible 1.1 +.\" Source: Ansible 1.2 .\" Language: English .\" -.TH "ANSIBLE\-DOC" "1" "02/01/2013" "Ansible 1\&.1" "System administration commands" +.TH "ANSIBLE\-DOC" "1" "04/02/2013" "Ansible 1\&.2" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -52,6 +52,6 @@ Copyright \(co 2012, Jan\-Piet Mens Ansible is released under the terms of the GPLv3 License\&. .SH "SEE ALSO" .sp -\fBansible\-playbook\fR(1), \fBansible\fR(1) +\fBansible\-playbook\fR(1), \fBansible\fR(1), \fBansible\-pull\fR(1) .sp Extensive documentation as well as IRC and mailing list info is available on the ansible home page: https://ansible\&.github\&.com/ diff --git a/docs/man/man1/ansible-playbook.1 b/docs/man/man1/ansible-playbook.1 index 5f9d923498..733479d2b4 100644 --- a/docs/man/man1/ansible-playbook.1 +++ b/docs/man/man1/ansible-playbook.1 @@ -2,12 +2,12 @@ .\" Title: ansible-playbook .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 02/16/2013 +.\" Date: 04/02/2013 .\" Manual: System administration commands -.\" Source: Ansible 1.1 +.\" Source: Ansible 1.2 .\" Language: English .\" -.TH "ANSIBLE\-PLAYBOOK" "1" "02/16/2013" "Ansible 1\&.1" "System administration commands" +.TH "ANSIBLE\-PLAYBOOK" "1" "04/02/2013" "Ansible 1\&.2" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -159,6 +159,6 @@ Copyright \(co 2012, Michael DeHaan Ansible is released under the terms of the GPLv3 License\&. .SH "SEE ALSO" .sp -\fBansible\fR(1), \fBansible\-pull\fR(1) +\fBansible\fR(1), \fBansible\-pull\fR(1), \fBansible\-doc\fR(1) .sp Extensive documentation as well as IRC and mailing list info is available on the ansible home page: https://ansible\&.github\&.com/ diff --git a/docs/man/man1/ansible-pull.1 b/docs/man/man1/ansible-pull.1 index 4fe3808cae..a66fac5900 100644 --- a/docs/man/man1/ansible-pull.1 +++ b/docs/man/man1/ansible-pull.1 @@ -2,12 +2,12 @@ .\" Title: ansible .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 02/01/2013 +.\" Date: 04/02/2013 .\" Manual: System administration commands -.\" Source: Ansible 1.1 +.\" Source: Ansible 1.2 .\" Language: English .\" -.TH "ANSIBLE" "1" "02/01/2013" "Ansible 1\&.1" "System administration commands" +.TH "ANSIBLE" "1" "04/02/2013" "Ansible 1\&.2" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -59,6 +59,6 @@ Copyright \(co 2012, Michael DeHaan Ansible is released under the terms of the GPLv3 License\&. .SH "SEE ALSO" .sp -\fBansible\fR(1), \fBansible\-playbook\fR(1) +\fBansible\fR(1), \fBansible\-playbook\fR(1), \fBansible\-doc\fR(1) .sp Extensive documentation as well as IRC and mailing list info is available on the ansible home page: https://ansible\&.github\&.com/ diff --git a/docs/man/man1/ansible.1 b/docs/man/man1/ansible.1 index f5871cc3b6..1ce641cf42 100644 --- a/docs/man/man1/ansible.1 +++ b/docs/man/man1/ansible.1 @@ -2,12 +2,12 @@ .\" Title: ansible .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 02/16/2013 +.\" Date: 04/02/2013 .\" Manual: System administration commands -.\" Source: Ansible 1.1 +.\" Source: Ansible 1.2 .\" Language: English .\" -.TH "ANSIBLE" "1" "02/16/2013" "Ansible 1\&.1" "System administration commands" +.TH "ANSIBLE" "1" "04/02/2013" "Ansible 1\&.2" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -194,6 +194,6 @@ Copyright \(co 2012, Michael DeHaan Ansible is released under the terms of the GPLv3 License\&. .SH "SEE ALSO" .sp -\fBansible\-playbook\fR(1), \fBansible\-pull\fR(1) +\fBansible\-playbook\fR(1), \fBansible\-pull\fR(1), \fBansible\-doc\fR(1) .sp Extensive documentation as well as IRC and mailing list info is available on the ansible home page: https://ansible\&.github\&.com/ diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py index b5f3ae6155..90de3bc537 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 . -__version__ = '1.1' +__version__ = '1.2' __author__ = 'Michael DeHaan' diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 353d70103b..14ec69e176 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,8 +1,14 @@ +ansible (1.2) unstable; urgency=low + + * release pending + + -- Michael DeHaan Tue, 02 Mar 2014 20:38:01 -0500 + ansible (1.1) unstable; urgency=low * 1.1 release - -- Michael DeHaan Fri, 25 Feb 2013 21:54:34 -0800 + -- Michael DeHaan Tue, 02 Mar 2014 20:38:00 -0500 ansible (1.0) unstable; urgency=low diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 719c15497c..ccc67d3be2 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -116,9 +116,12 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Feb 1 2013 Michael DeHaan - 1.1-0 +* Tue Apr 2 2013 Michael DeHaan - 1.2-0 * release pending +* Tue Apr 2 2013 Michael DeHaan - 1.1-0 +* Release 1.1 + * Fri Feb 1 2013 Michael DeHaan - 1.0-0 - Release 1.0