Skip to content

Commit

Permalink
Fix up some version related things on the devel branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
mpdehaan committed Feb 2, 2013
1 parent cd7c3e7 commit 318e330
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 46 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
3 changes: 2 additions & 1 deletion RELEASES.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0
1.1
25 changes: 5 additions & 20 deletions docs/man/man1/ansible-doc.1
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
'\" t
.\" Title: ansible-doc
.\" Author: :doctype:manpage
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
.\" Date: 11/28/2012
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" 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
.\" -----------------------------------------------------------------
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions docs/man/man1/ansible-playbook.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
.\" Title: ansible-playbook
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" 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
.\" -----------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions docs/man/man1/ansible-pull.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
.\" Title: ansible
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" 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
.\" -----------------------------------------------------------------
Expand Down
19 changes: 5 additions & 14 deletions docs/man/man1/ansible.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,12 @@
.\" Title: ansible
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" 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
.\" -----------------------------------------------------------------
Expand All @@ -34,7 +25,7 @@ ansible \- run a command somewhere else
ansible <host\-pattern> [\-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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.0'
__version__ = '1.1'
__author__ = 'Michael DeHaan'
8 changes: 6 additions & 2 deletions packaging/rpm/ansible.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -97,8 +97,12 @@ rm -rf $RPM_BUILD_ROOT
%doc README.md PKG-INFO COPYING

%changelog

* Fri Feb 1 2013 Michael DeHaan <[email protected]> - 1.1-0
* release pending

* Fri Feb 1 2013 Michael DeHaan <[email protected]> - 1.0-0
- Release pending
- Release 1.0

* Fri Nov 30 2012 Michael DeHaan <[email protected]> - 0.9-0
- Release 0.9
Expand Down

0 comments on commit 318e330

Please sign in to comment.