diff options
author | James Cammarata <jimi@sngx.net> | 2014-07-25 12:16:40 -0500 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2014-07-25 12:16:40 -0500 |
commit | 5fc8ea8e01353cb7802f851c4a77f5ac1de2e339 (patch) | |
tree | 1c4954b91731529f18245c89e6b87f382e2f9422 | |
parent | f4f18a6375f8574ed80d7c3428686417b154fe92 (diff) | |
download | ansible-5fc8ea8e01353cb7802f851c4a77f5ac1de2e339.tar.gz |
Version bump for release 1.6.10
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | RELEASES.txt | 3 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | lib/ansible/__init__.py | 2 | ||||
-rw-r--r-- | packaging/debian/changelog | 8 | ||||
-rw-r--r-- | packaging/rpm/ansible.spec | 5 |
6 files changed, 21 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 743bf5a083..9b4324490a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ Ansible Changes By Release ========================== -## 1.6.9 "And the Cradle Will Rock" - Jul 25, 2014 +## 1.6.10 "And the Cradle Will Rock" - Jul 25, 2014 + +- Fixes an issue with the copy module when copying a directory that fails when changing file attributes and the target file already exists +- Improved unicode handling when splitting args + +## 1.6.9 "And the Cradle Will Rock" - Jul 24, 2014 - Further improvements to module parameter parsing to address additional regressions caused by security fixes diff --git a/RELEASES.txt b/RELEASES.txt index 535b5917f2..618c09f040 100644 --- a/RELEASES.txt +++ b/RELEASES.txt @@ -6,7 +6,8 @@ Active Development 1.7 "Summer Nights" -------- CURRENT DEVEL BRANCH -1.6.9 "The Cradle Will Rock" - 07-25-2014 +1.6.10 "The Cradle Will Rock" - 07-25-2014 +1.6.9 "The Cradle Will Rock" - 07-24-2014 1.6.8 "The Cradle Will Rock" - 07-22-2014 1.6.7 "The Cradle Will Rock" - 07-21-2014 1.6.6 "The Cradle Will Rock" - 07-01-2014 @@ -1 +1 @@ -1.6.9 +1.6.10 diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py index cc93d7deed..5c58f5fbd7 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.6.9' +__version__ = '1.6.10' __author__ = 'Michael DeHaan' diff --git a/packaging/debian/changelog b/packaging/debian/changelog index f2dd43028f..0e9c8df905 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,8 +1,14 @@ +ansible (1.6.10) unstable; urgency=low + + * 1.6.10 release + + -- Michael DeHaan <michael@ansible.com> Fri, 25 Jul 2014 13:00:00 -0500 + ansible (1.6.9) unstable; urgency=low * 1.6.9 release - -- Michael DeHaan <michael@ansible.com> Fri, 25 Jul 2014 00:00:00 -0500 + -- Michael DeHaan <michael@ansible.com> Thu, 24 Jul 2014 23:30:00 -0500 ansible (1.6.8) unstable; urgency=low diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index a468eb9093..d2dda2fcfd 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -115,7 +115,10 @@ rm -rf %{buildroot} %changelog -* Fri Jul 25 2014 Michael DeHaan <michael@ansible.com> - 1.6.9 +* Fri Jul 25 2014 Michael DeHaan <michael@ansible.com> - 1.6.10 +- Release 1.6.10 + +* Thu Jul 24 2014 Michael DeHaan <michael@ansible.com> - 1.6.9 - Release 1.6.9 * Tue Jul 22 2014 Michael DeHaan <michael@ansible.com> - 1.6.8 |