From 318e3302fbefdb644cb9c64dad4ee10e239da0ee Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 1 Feb 2013 21:38:21 -0500 Subject: [PATCH] Fix up some version related things on the devel branch. --- CHANGELOG.md | 6 +++++- RELEASES.txt | 3 ++- VERSION | 2 +- docs/man/man1/ansible-doc.1 | 25 +++++-------------------- docs/man/man1/ansible-playbook.1 | 6 +++--- docs/man/man1/ansible-pull.1 | 6 +++--- docs/man/man1/ansible.1 | 19 +++++-------------- lib/ansible/__init__.py | 2 +- packaging/rpm/ansible.spec | 8 ++++++-- 9 files changed, 31 insertions(+), 46 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e94aaaf978..22e77bc067 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ Ansible Changes By Release ========================== -1.0 "Eruption" -- release pending -- changes unsorted for now +1.1 "Mean Street" -- Release pending + +* ... + +1.0 "Eruption" -- Feb 1 2013 New modules: diff --git a/RELEASES.txt b/RELEASES.txt index 7d72a2ab6a..9e22c96614 100644 --- a/RELEASES.txt +++ b/RELEASES.txt @@ -1,7 +1,8 @@ Ansible Releases at a Glance ============================ -1.0 "Eruption" -------- pending +1.1 "Mean Street" ----- pending +1.0 "Eruption" -------- 02-01-2013 0.9 "Dreams" ---------- 11-30-2012 0.8 "Cathedral" ------- 10-19-2012 0.7 "Panama" ---------- 09-06-2012 diff --git a/VERSION b/VERSION index d3827e75a5..9459d4ba2a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/docs/man/man1/ansible-doc.1 b/docs/man/man1/ansible-doc.1 index edee111ec2..9bf31657bf 100644 --- a/docs/man/man1/ansible-doc.1 +++ b/docs/man/man1/ansible-doc.1 @@ -1,22 +1,13 @@ '\" t .\" Title: ansible-doc -.\" Author: :doctype:manpage -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 11/28/2012 +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 02/01/2013 .\" Manual: System administration commands -.\" Source: Ansible 0.9 +.\" Source: Ansible 1.1 .\" Language: English .\" -.TH "ANSIBLE\-DOC" "1" "11/28/2012" "Ansible 0\&.9" "System administration commands" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' +.TH "ANSIBLE\-DOC" "1" "02/01/2013" "Ansible 1\&.1" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -64,9 +55,3 @@ Ansible is released under the terms of the GPLv3 License\&. \fBansible\-playbook\fR(1), \fBansible\fR(1) .sp Extensive documentation as well as IRC and mailing list info is available on the ansible home page: https://ansible\&.github\&.com/ -.SH "AUTHOR" -.PP -\fB:doctype:manpage\fR -.RS 4 -Author. -.RE diff --git a/docs/man/man1/ansible-playbook.1 b/docs/man/man1/ansible-playbook.1 index aa56d36179..548a491a58 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: 11/03/2012 +.\" Date: 02/01/2013 .\" Manual: System administration commands -.\" Source: Ansible 0.9 +.\" Source: Ansible 1.1 .\" Language: English .\" -.TH "ANSIBLE\-PLAYBOOK" "1" "11/03/2012" "Ansible 0\&.9" "System administration commands" +.TH "ANSIBLE\-PLAYBOOK" "1" "02/01/2013" "Ansible 1\&.1" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/man/man1/ansible-pull.1 b/docs/man/man1/ansible-pull.1 index d2acc0b8ce..4fe3808cae 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: 10/19/2012 +.\" Date: 02/01/2013 .\" Manual: System administration commands -.\" Source: Ansible 0.9 +.\" Source: Ansible 1.1 .\" Language: English .\" -.TH "ANSIBLE" "1" "10/19/2012" "Ansible 0\&.9" "System administration commands" +.TH "ANSIBLE" "1" "02/01/2013" "Ansible 1\&.1" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/man/man1/ansible.1 b/docs/man/man1/ansible.1 index e3e0bd2a61..c8daacd08d 100644 --- a/docs/man/man1/ansible.1 +++ b/docs/man/man1/ansible.1 @@ -2,21 +2,12 @@ .\" Title: ansible .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 12/04/2012 +.\" Date: 02/01/2013 .\" Manual: System administration commands -.\" Source: Ansible 0.9 +.\" Source: Ansible 1.1 .\" Language: English .\" -.TH "ANSIBLE" "1" "12/04/2012" "Ansible 0\&.9" "System administration commands" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' +.TH "ANSIBLE" "1" "02/01/2013" "Ansible 1\&.1" "System administration commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -34,7 +25,7 @@ ansible \- run a command somewhere else ansible [\-f forks] [\-m module_name] [\-a args] .SH "DESCRIPTION" .sp -\fBAnsible\fR is an extra\-simple tool/framework/API for doing \*(Aqremote things\*(Aq over SSH\&. +\fBAnsible\fR is an extra\-simple tool/framework/API for doing \'remote things\' over SSH\&. .SH "ARGUMENTS" .PP \fBhost\-pattern\fR @@ -82,7 +73,7 @@ to load modules from\&. The default is \fI/usr/share/ansible\fR\&. .RE .PP -\fB\-a\fR \*(Aq\fIARGUMENTS\fR\*(Aq, \fB\-\-args=\fR\*(Aq\fIARGUMENTS\fR\*(Aq +\fB\-a\fR \'\fIARGUMENTS\fR\', \fB\-\-args=\fR\'\fIARGUMENTS\fR\' .RS 4 The \fIARGUMENTS\fR diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py index dc837a73b9..b5f3ae6155 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.0' +__version__ = '1.1' __author__ = 'Michael DeHaan' diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index c574c8cade..64305291ae 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 task execution system -Version: 1.0 +Version: 1.1 Group: Development/Libraries License: GPLv3 @@ -97,8 +97,12 @@ rm -rf $RPM_BUILD_ROOT %doc README.md PKG-INFO COPYING %changelog + +* Fri Feb 1 2013 Michael DeHaan - 1.1-0 +* release pending + * Fri Feb 1 2013 Michael DeHaan - 1.0-0 -- Release pending +- Release 1.0 * Fri Nov 30 2012 Michael DeHaan - 0.9-0 - Release 0.9