summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/CHANGELOG-v2.5.rst34
-rw-r--r--changelogs/fragments/fix_ios_vlan.yaml4
-rw-r--r--changelogs/fragments/ios_linkagg_fix.yml4
-rw-r--r--changelogs/fragments/v2.5.7_summary.yaml3
-rw-r--r--lib/ansible/release.py2
5 files changed, 42 insertions, 5 deletions
diff --git a/changelogs/CHANGELOG-v2.5.rst b/changelogs/CHANGELOG-v2.5.rst
index 2b1b3959ff..8062d94183 100644
--- a/changelogs/CHANGELOG-v2.5.rst
+++ b/changelogs/CHANGELOG-v2.5.rst
@@ -2,6 +2,40 @@
Ansible 2.5 "Kashmir" Release Notes
===================================
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.7:
+
+v2.5.7
+======
+
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.7_Release Summary:
+
+Release Summary
+---------------
+
+| Release Date: 2018-07-26
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
+
+
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.7_Bugfixes:
+
+Bugfixes
+--------
+
+- eos_facts - fix failure when lldp will be disabled (https://github.com/ansible/ansible/pull/42347)
+
+- ios_vlan - fix unable to identify correct vlan issue (https://github.com/ansible/ansible/pull/42247)
+
+- ios_linkagg - fix picking correct interface names issue (https://github.com/ansible/ansible/pull/42557)
+
+- get_capabilities in nxapi module_utils should not return empty dictionary (https://github.com/ansible/ansible/pull/42688).
+
+- Enforcing NXAPI default HTTP behavior (https://github.com/ansible/ansible/pull/41817).
+
+- pause - do not set stdout to raw mode when redirecting to a file (https://github.com/ansible/ansible/issues/41717)
+
+- pause - nest try except when importing curses to gracefully fail if curses is not present (https://github.com/ansible/ansible/issues/42004)
+
+
.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.6:
v2.5.6
diff --git a/changelogs/fragments/fix_ios_vlan.yaml b/changelogs/fragments/fix_ios_vlan.yaml
index 1672125802..77964655d7 100644
--- a/changelogs/fragments/fix_ios_vlan.yaml
+++ b/changelogs/fragments/fix_ios_vlan.yaml
@@ -1,2 +1,2 @@
-- bugfixes:
- - ios_vlan - fix unable to identify correct vlan issue (https://github.com/ansible/ansible/pull/42247)
+bugfixes:
+- ios_vlan - fix unable to identify correct vlan issue (https://github.com/ansible/ansible/pull/42247)
diff --git a/changelogs/fragments/ios_linkagg_fix.yml b/changelogs/fragments/ios_linkagg_fix.yml
index 132a407745..9966cf4179 100644
--- a/changelogs/fragments/ios_linkagg_fix.yml
+++ b/changelogs/fragments/ios_linkagg_fix.yml
@@ -1,2 +1,2 @@
-- bugfixes:
- - ios_linkagg - fix picking correct interface names issue (https://github.com/ansible/ansible/pull/42557)
+bugfixes:
+- ios_linkagg - fix picking correct interface names issue (https://github.com/ansible/ansible/pull/42557)
diff --git a/changelogs/fragments/v2.5.7_summary.yaml b/changelogs/fragments/v2.5.7_summary.yaml
new file mode 100644
index 0000000000..ebb54280aa
--- /dev/null
+++ b/changelogs/fragments/v2.5.7_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+ | Release Date: 2018-07-26
+ | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index da7ba73151..67b2a3b896 100644
--- a/lib/ansible/release.py
+++ b/lib/ansible/release.py
@@ -19,6 +19,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-__version__ = '2.5.6'
+__version__ = '2.5.7'
__author__ = 'Ansible, Inc.'
__codename__ = 'Kashmir'