Fix merge conflicts from 1.5.1 release notes

5 files changed, 29 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2703f76909..4380ac5e8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,14 @@ Other notable changes:
 
 * info pending
 
-## 1.5 "Love Walks In" - Feb 28, 2014
+## 1.5.1 "Love Walks In" - March 10, 2014
+
+- Force command action to not be executed by the shell unless specifically enabled.
+- Validate SSL certs accessed through urllib*.
+- Implement new default cipher class AES256 in ansible-vault.
+- Misc bug fixes.
+
+## 1.5 "Love Walks In" - February 28, 2014
 
 Major features/changes:
 
diff --git a/RELEASES.txt b/RELEASES.txt
index c909346c7e..3537d1e838 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -14,6 +14,9 @@ Active Development
 Previous
 ++++++++
 
+=======
+1.6    "The Cradle Will Rock" - NEXT 
+1.5.1  "Love Walks In" -------- 03-10-2014
 1.5    "Love Walks In" -------- 02-28-2014
 1.4.5  "Could This Be Magic?" - 02-12-2014
 1.4.4  "Could This Be Magic?" - 01-06-2014
diff --git a/docsite/rst/index.rst b/docsite/rst/index.rst
index 592c683fbb..f7e00bfcb6 100644
--- a/docsite/rst/index.rst
+++ b/docsite/rst/index.rst
@@ -16,7 +16,7 @@ We believe simplicity is relevant to all sizes of environments and design for bu
 Ansible manages machines in an agentless manner. There is never a question of how to
 upgrade remote daemons or the problem of not being able to manage systems because daemons are uninstalled.  As OpenSSH is one of the most peer reviewed open source components, the security exposure of using the tool is greatly reduced.  Ansible is decentralized -- it relies on your existing OS credentials to control access to remote machines; if needed it can easily connect with Kerberos, LDAP, and other centralized authentication management systems.
 
-This documentation covers the current released version of Ansible (1.5) and also some development version features (1.6).  For recent features, in each section, the version of Ansible where the feature is added is indicated.  Ansible, Inc releases a new major release of Ansible approximately every 2 months.  The core application evolves somewhat conservatively, valuing simplicity in language design and setup, while the community around new modules and plugins being developed and contributed moves very very quickly, typically adding 20 or so new modules in each release.
+This documentation covers the current released version of Ansible (1.5.1) and also some development version features (1.6).  For recent features, in each section, the version of Ansible where the feature is added is indicated.  Ansible, Inc releases a new major release of Ansible approximately every 2 months.  The core application evolves somewhat conservatively, valuing simplicity in language design and setup, while the community around new modules and plugins being developed and contributed moves very very quickly, typically adding 20 or so new modules in each release.
 
 .. _an_introduction:
 
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 9a6fb7c58c..00c863f305 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -4,12 +4,21 @@ ansible (1.6) unstable; urgency=low
  
  -- Michael DeHaan <michael.dehaan@gmail.com>  Fri, 28 February 2014 15:00:03 -0500
 
+ansible (1.5.1) unstable; urgency=low
+
+  * 1.5.1 release
+
+ -- Michael DeHaan <michael@ansible.com>  Mon, 10 March 2014 17:33:44 -0500
 
 ansible (1.5) unstable; urgency=low
 
   * 1.5 release
  
+<<<<<<< HEAD
  -- Michael DeHaan <michael.dehaan@gmail.com>  Fri, 28 February 2014 15:00:02 -0500
+=======
+ -- Michael DeHaan <michael@ansible.com>  Fri, 28 February 2014 00:00:00 -0500
+>>>>>>> 16c05cbc8892041cacba3ff87c86e68b86b4511b
 
 ansible (1.4.5) unstable; urgency=low
 
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index d3783c1e9c..6be398ef10 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -102,8 +102,16 @@ rm -rf %{buildroot}
 
 %changelog
 
+<<<<<<< HEAD
 * Thu Feb 28 2014 Michael DeHaan <michael.dehaan@gmail.com> - 1.6-0
 * (PENDING)
+=======
+* Fri Mar 10 2014 Michael DeHaan <michael@ansible.com> - 1.5.1
+- Release 1.5.1
+
+* Fri Feb 28 2014 Michael DeHaan <michael@ansible.com> - 1.5.0
+- Release 1.5.0
+>>>>>>> 16c05cbc8892041cacba3ff87c86e68b86b4511b
 
 * Thu Feb 28 2014 Michael DeHaan <michael.dehaan@gmail.com> - 1.5-0
 * Release 1.5