summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/.changes.yaml10
-rw-r--r--changelogs/CHANGELOG-v2.6.rst19
-rw-r--r--changelogs/fragments/v2.6.0rc3_summary.yaml3
-rw-r--r--lib/ansible/release.py2
4 files changed, 33 insertions, 1 deletions
diff --git a/changelogs/.changes.yaml b/changelogs/.changes.yaml
index 7f2f040237..f6b5591265 100644
--- a/changelogs/.changes.yaml
+++ b/changelogs/.changes.yaml
@@ -290,3 +290,13 @@ releases:
- ec2_ami_fix_block_device_mapping_volume_size_type.yaml
- v2.6.0rc2_summary.yaml
release_date: '2018-06-08'
+ 2.6.0rc3:
+ codename: Heartbreaker
+ fragments:
+ - digital_ocean_block_storage_fix.yaml
+ - gce-sort-fix.yaml
+ - iosxr_config_route_policy_objects_fix.yaml
+ - no_log_fix_for_connection_exceptions.yaml
+ - reset_con_fix.yml
+ - v2.6.0rc3_summary.yaml
+ release_date: '2018-06-18'
diff --git a/changelogs/CHANGELOG-v2.6.rst b/changelogs/CHANGELOG-v2.6.rst
index 91880ac201..216b4f8586 100644
--- a/changelogs/CHANGELOG-v2.6.rst
+++ b/changelogs/CHANGELOG-v2.6.rst
@@ -2,6 +2,25 @@
Ansible 2.6 "Heartbreaker" Release Notes
========================================
+v2.6.0rc3
+=========
+
+Release Summary
+---------------
+
+| Release Date: 2018-06-18
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
+
+
+Bugfixes
+--------
+
+- **Security Fix** - Some connection exceptions would cause no_log specified on a task to be ignored. If this happened, the task information, including any private information could have been displayed to stdout and (if enabled, not the default) logged to a log file specified in ansible.cfg's log_path. Additionally, sites which redirected stdout from ansible runs to a log file may have stored that private information onto disk that way as well. (https://github.com/ansible/ansible/pull/41414)
+- Fix added for Digital Ocean Volumes API change causing Ansible to recieve an unexpected value in the response. (https://github.com/ansible/ansible/pull/41431)
+- Fix iosxr_config module to handle route-policy, community-set, prefix-set, as-path-set and rd-set blocks. All these blocks are part of route-policy language of iosxr.
+- gce_net - Fix sorting of allowed ports (https://github.com/ansible/ansible/pull/41567)
+- uses correct conn info for reset_connection https://github.com/ansible/ansible/issues/27520
+
v2.6.0rc2
=========
diff --git a/changelogs/fragments/v2.6.0rc3_summary.yaml b/changelogs/fragments/v2.6.0rc3_summary.yaml
new file mode 100644
index 0000000000..69628c762c
--- /dev/null
+++ b/changelogs/fragments/v2.6.0rc3_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+ | Release Date: 2018-06-18
+ | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index b18f664ebb..48804e6eaa 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.6.0.dev0'
+__version__ = '2.6.0rc3'
__author__ = 'Ansible, Inc.'
__codename__ = 'Heartbreaker'