Back-porting 1.6.x release info into CHANGELOG/RELEASES and packaging

4 files changed, 62 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca915295f4..654c0ad861 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,34 @@ New Modules:
 * cloud: azure
 * cloud: rax_meta
 
+## 1.6.3 "And the Cradle Will Rock" - Jun 09, 2014
+
+- Corrects a regression where handlers were run across all hosts, not just those that triggered the handler.
+- Fixed a bug in which modules did not support properly moving a file atomically when su was in use.
+- Fixed two bugs related to symlinks with directories when using the file module.
+- Fixed a bug related to MySQL master replication syntax.
+- Corrects a regression in the order of variable merging done by the internal runner code.
+- Various other minor bug fixes.
+
+## 1.6.2 "And the Cradle Will Rock" - May 23, 2014
+
+- If an improper locale is specified, core modules will now automatically revert to using the 'C' locale.
+- Modules using the fetch_url utility will now obey proxy environment variables.
+- The SSL validation step in fetch_url will likewise obey proxy settings, however only proxies using the http protocol are supported.
+- Fixed multiple bugs in docker module related to version changes upstream.
+- Fixed a bug in the ec2_group module where egress rules were lost when a VPC was specified.
+- Fixed two bugs in the synchronize module:
+  * a trailing slash might be lost when calculating relative paths, resulting in an incorrect destination.
+  * the sync might use the inventory directory incorrectly instead of the playbook or role directory.
+- Files will now only be chown'd on an atomic move if the src/dest uid/gid do not match.
+
+## 1.6.1 "And the Cradle Will Rock" - May 7, 2014
+
+- Fixed a bug in group_by, where systems were being grouped incorrectly.
+- Fixed a bug where file descriptors may leak to a child process when using accelerate.
+- Fixed a bug in apt_repository triggered when python-apt not being installed/available.
+- Fixed a bug in the apache2_module module, where modules were not being disabled correctly.
+
 ## 1.6 "And the Cradle Will Rock" - May 5, 2014
 
 Major features/changes:
diff --git a/RELEASES.txt b/RELEASES.txt
index 39dc5b7c5d..4e8aafc84b 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -6,6 +6,9 @@ Active Development
 
 1.7    "Summer Nights" -------- SUMMER 2014
 
+1.6.3  "The Cradle Will Rock" - 06-09-2014
+1.6.2  "The Cradle Will Rock" - 05-23-2014
+1.6.1  "The Cradle Will Rock" - 05-07-2014
 1.6    "The Cradle Will Rock" - 05-05-2014 
 1.5.5  "Love Walks In" -------- 04-18-2014
 1.5.4  "Love Walks In" -------- 04-01-2014
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index c3cfc334e5..7b13b7fcc4 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -4,11 +4,29 @@ ansible (1.7) unstable; urgency=low
 
  -- Michael DeHaan <michael.dehaan@gmail.com>  Wed, 07 May 2014 15:00:03 -0500
 
+ansible (1.6.3) unstable; urgency=low
+
+  * 1.6.3 release
+
+  -- Michael DeHaan <michael@ansible.com>  Mon, 09 Jun 2014 16:30:00 -0500
+
+ansible (1.6.2) unstable; urgency=low
+
+  * 1.6.2 release
+
+  -- Michael DeHaan <michael@ansible.com>  Fri, 23 May 2014 17:30:00 -0500
+
+ansible (1.6.1) unstable; urgency=low
+
+  * 1.6.1 release
+
+  -- Michael DeHaan <michael@ansible.com>  Wed, 07 May 2014 13:30:00 -0500
+
 ansible (1.6) unstable; urgency=low
 
   * 1.6.0 release
- 
- -- Michael DeHaan <michael.dehaan@gmail.com>  Mon, 05 May 2014 17:30:03 -0500
+
+  -- Michael DeHaan <michael@ansible.com>  Mon, 05 May 2014 17:30:03 -0500
 
 ansible (1.5.5) unstable; urgency=low
 
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 1191c6b4e8..775047aa72 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -1,11 +1,12 @@
 %define name ansible
+%define ansible_version $VERSION
 
 %if 0%{?rhel} == 5
 %define __python /usr/bin/python26
 %endif
 
 Name:      %{name}
-Version:   1.6
+Version:   %{ansible_version}
 Release:   1%{?dist}
 Url:       http://www.ansible.com
 Summary:   SSH-based application deployment, configuration management, and IT orchestration platform
@@ -114,6 +115,15 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Mon Jun 09 2014 Michael DeHaan <michael@ansible.com> - 1.6.3
+- Release 1.6.3
+
+* Fri May 23 2014 Michael DeHaan <michael@ansible.com> - 1.6.2
+- Release 1.6.2
+
+* Wed May 07 2014 Michael DeHaan <michael@ansible.com> - 1.6.1
+- Release 1.6.1
+
 * Mon May 05 2014 Michael DeHaan <michael@ansible.com> - 1.6.0
 - Release 1.6.0