diff options
| -rw-r--r-- | changelogs/CHANGELOG-v2.5.rst | 27 | ||||
| -rw-r--r-- | changelogs/fragments/onyx-tmpfile.yaml | 3 | ||||
| -rw-r--r-- | changelogs/fragments/v2.5.0b2_summary.yaml | 2 | ||||
| -rw-r--r-- | changelogs/fragments/v2.5.0rc3_catchup.yaml | 3 | ||||
| -rw-r--r-- | changelogs/fragments/v2.5.0rc3_summary.yaml (renamed from changelogs/fragments/v2.5.0rc2_summary.yaml) | 4 | ||||
| -rw-r--r-- | lib/ansible/release.py | 2 |
6 files changed, 25 insertions, 16 deletions
diff --git a/changelogs/CHANGELOG-v2.5.rst b/changelogs/CHANGELOG-v2.5.rst index 08b78664cb..f9dd57f4ee 100644 --- a/changelogs/CHANGELOG-v2.5.rst +++ b/changelogs/CHANGELOG-v2.5.rst @@ -2,17 +2,32 @@ Ansible 2.5 "Kashmir" Release Notes =================================== -v2.5.0rc2 +v2.5.0rc3 ========= Release Summary --------------- -| Release Date: 2018-03-08 -| Estimated Final Release: 2018-03-15 +| Release Date: 2018-03-15 +| Estimated Final Release: 2018-03-22 | `Porting Guide <http://docs.ansible.com/ansible/devel/porting_guides.html>`_ +Bugfixes +-------- + +- Connection error messages may contain characters that jinja2 would interpret as a template. Wrap the error string so this doesn't happen (https://github.com/ansible/ansible/pull/37329) + +- Fix onyx_linkagg module writing debugging information to a tempfile on the remote machine (https://github.com/ansible/ansible/pull/37308) + +- terraform - fixed typo in module result stdout value (https://github.com/ansible/ansible/pull/37253) + +- setup - ensure that `ansible_lo` is properly nested under ansible_facts (https://github.com/ansible/ansible/pull/37360) + + +v2.5.0rc2 +========= + Major Changes ------------- @@ -157,12 +172,6 @@ Bugfixes v2.5.0b2 ======== -Release Summary ---------------- - -| Release Date: 2018-02-15 - - Major Changes ------------- diff --git a/changelogs/fragments/onyx-tmpfile.yaml b/changelogs/fragments/onyx-tmpfile.yaml index 1e8a950ee3..c47f1ba8e5 100644 --- a/changelogs/fragments/onyx-tmpfile.yaml +++ b/changelogs/fragments/onyx-tmpfile.yaml @@ -1,3 +1,2 @@ ---- bugfixes: -- Fix onyx_linkagg module writing debugging information to a tempfile on the remote machine: https://github.com/ansible/ansible/pull/37308 +- Fix onyx_linkagg module writing debugging information to a tempfile on the remote machine (https://github.com/ansible/ansible/pull/37308) diff --git a/changelogs/fragments/v2.5.0b2_summary.yaml b/changelogs/fragments/v2.5.0b2_summary.yaml deleted file mode 100644 index 59eed81a0c..0000000000 --- a/changelogs/fragments/v2.5.0b2_summary.yaml +++ /dev/null @@ -1,2 +0,0 @@ -release_summary: | - | Release Date: 2018-02-15 diff --git a/changelogs/fragments/v2.5.0rc3_catchup.yaml b/changelogs/fragments/v2.5.0rc3_catchup.yaml new file mode 100644 index 0000000000..0637d41d20 --- /dev/null +++ b/changelogs/fragments/v2.5.0rc3_catchup.yaml @@ -0,0 +1,3 @@ +bugfixes: +- terraform - fixed typo in module result stdout value (https://github.com/ansible/ansible/pull/37253) +- setup - ensure that `ansible_lo` is properly nested under ansible_facts (https://github.com/ansible/ansible/pull/37360) diff --git a/changelogs/fragments/v2.5.0rc2_summary.yaml b/changelogs/fragments/v2.5.0rc3_summary.yaml index 0ea2379b16..a9f6d794b9 100644 --- a/changelogs/fragments/v2.5.0rc2_summary.yaml +++ b/changelogs/fragments/v2.5.0rc3_summary.yaml @@ -1,4 +1,4 @@ release_summary: | - | Release Date: 2018-03-08 - | Estimated Final Release: 2018-03-15 + | Release Date: 2018-03-15 + | Estimated Final Release: 2018-03-22 | `Porting Guide <http://docs.ansible.com/ansible/devel/porting_guides.html>`_ diff --git a/lib/ansible/release.py b/lib/ansible/release.py index b5f8e0adff..a0dbd36e8e 100644 --- a/lib/ansible/release.py +++ b/lib/ansible/release.py @@ -19,5 +19,5 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -__version__ = '2.5.0rc2' +__version__ = '2.5.0rc3' __author__ = 'Ansible, Inc.' |