Update release versions for 1.2.1v1.2.1

6 files changed, 35 insertions, 15 deletions

diff --git a/VERSION b/VERSION
index 5625e59da8..b98c315665 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1,2 @@
-1.2
+1.2.1
+
diff --git a/docs/man/man1/ansible-doc.1 b/docs/man/man1/ansible-doc.1
index 16d5759b58..e18bce93dd 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 <http://docbook.sf.net/>
-.\"      Date: 04/02/2013
+.\"      Date: 07/04/2013
 .\"    Manual: System administration commands
-.\"    Source: Ansible 1.2
+.\"    Source: Ansible 1.2.1
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-DOC" "1" "04/02/2013" "Ansible 1\&.2" "System administration commands"
+.TH "ANSIBLE\-DOC" "1" "07/04/2013" "Ansible 1\&.2\&.1" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
diff --git a/docs/man/man1/ansible-playbook.1 b/docs/man/man1/ansible-playbook.1
index 85187cdbcf..e835751135 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 <http://docbook.sf.net/>
-.\"      Date: 06/03/2013
+.\"      Date: 07/04/2013
 .\"    Manual: System administration commands
-.\"    Source: Ansible 1.2
+.\"    Source: Ansible 1.2.1
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-PLAYBOOK" "1" "06/03/2013" "Ansible 1\&.2" "System administration commands"
+.TH "ANSIBLE\-PLAYBOOK" "1" "07/04/2013" "Ansible 1\&.2\&.1" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
diff --git a/docs/man/man1/ansible-pull.1 b/docs/man/man1/ansible-pull.1
index a66fac5900..fd263ebd6f 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 <http://docbook.sf.net/>
-.\"      Date: 04/02/2013
+.\"      Date: 07/04/2013
 .\"    Manual: System administration commands
-.\"    Source: Ansible 1.2
+.\"    Source: Ansible 1.2.1
 .\"  Language: English
 .\"
-.TH "ANSIBLE" "1" "04/02/2013" "Ansible 1\&.2" "System administration commands"
+.TH "ANSIBLE" "1" "07/04/2013" "Ansible 1\&.2\&.1" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -22,7 +22,7 @@
 ansible-pull \- set up a remote copy of ansible on each managed node
 .SH "SYNOPSIS"
 .sp
-ansible \-d DEST \-U URL [ \-C CHECKOUT ]
+ansible \-d DEST \-U URL [ \-C CHECKOUT ] [ \-i INVENTORY ] [ <filename\&.yml> ]
 .SH "DESCRIPTION"
 .sp
 \fBAnsible\fR is an extra\-simple tool/framework/API for doing \'remote things\' over SSH\&.
@@ -32,6 +32,13 @@ Use ansible\-pull to set up a remote copy of ansible on each managed node, each
 The setup playbook can be tuned to change the cron frequency, logging locations, and parameters to ansible\-pull\&.
 .sp
 This is useful both for extreme scale\-out as well as periodic remediation\&. Usage of the \fIfetch\fR module to retrieve logs from ansible\-pull runs would be an excellent way to gather and analyze remote logs from ansible\-pull\&.
+.SH "OPTIONAL ARGUMENT"
+.PP
+\fBfilename\&.yml\fR
+.RS 4
+The name of one the YAML format files to run as an ansible playbook\&. This can be a relative path within the git checkout\&. If not provided, ansible\-pull will look for a playbook based on the host\(cqs fully\-qualified domain name and finally a playbook named
+\fBlocal\&.yml\fR\&.
+.RE
 .SH "OPTIONS"
 .PP
 \fB\-d\fR \fIDEST\fR, \fB\-\-directory=\fR\fIDEST\fR
@@ -49,6 +56,18 @@ URL of git repository to clone\&.
 Branch/Tag/Commit to checkout\&. Defaults to
 \fIHEAD\fR\&.
 .RE
+.PP
+\fB\-i\fR \fIPATH\fR, \fB\-\-inventory=\fR\fIPATH\fR
+.RS 4
+The
+\fIPATH\fR
+to the inventory hosts file\&. This can be a relative path within the git checkout\&.
+.RE
+.PP
+\fB\-\-purge\fR
+.RS 4
+Purge the git checkout after the playbook is run\&.
+.RE
 .SH "AUTHOR"
 .sp
 Ansible was originally written by Michael DeHaan\&. See the AUTHORS file for a complete list of contributors\&.
diff --git a/docs/man/man1/ansible.1 b/docs/man/man1/ansible.1
index 813f1a8cc0..b610b383bd 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 <http://docbook.sf.net/>
-.\"      Date: 05/29/2013
+.\"      Date: 07/04/2013
 .\"    Manual: System administration commands
-.\"    Source: Ansible 1.2
+.\"    Source: Ansible 1.2.1
 .\"  Language: English
 .\"
-.TH "ANSIBLE" "1" "05/29/2013" "Ansible 1\&.2" "System administration commands"
+.TH "ANSIBLE" "1" "07/04/2013" "Ansible 1\&.2\&.1" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index 90de3bc537..688c366e1d 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.2'
+__version__ = '1.2.1'
 __author__ = 'Michael DeHaan'