New release v2.6.0rc2v2.6.0rc2

4 files changed, 39 insertions, 2 deletions

diff --git a/changelogs/.changes.yaml b/changelogs/.changes.yaml
index 4bb74aac21..7f2f040237 100644
--- a/changelogs/.changes.yaml
+++ b/changelogs/.changes.yaml
@@ -278,3 +278,15 @@ releases:
     - v2.6.0rc1_catchup.yaml
     - v2.6.0rc1_summary.yaml
     release_date: '2018-06-05'
+  2.6.0rc2:
+    codename: Heartbreaker
+    fragments:
+    - 41167_ansible_doc_regression.yaml
+    - admin-users-default-change.yaml
+    - aws_s3_async_fix.yaml
+    - aws_s3_decryption_fix.yaml
+    - aws_s3_fix_custom_endpoints.yaml
+    - aws_s3_fix_exception_handling.yaml
+    - ec2_ami_fix_block_device_mapping_volume_size_type.yaml
+    - v2.6.0rc2_summary.yaml
+    release_date: '2018-06-08'
diff --git a/changelogs/CHANGELOG-v2.6.rst b/changelogs/CHANGELOG-v2.6.rst
index 4d428943d8..91880ac201 100644
--- a/changelogs/CHANGELOG-v2.6.rst
+++ b/changelogs/CHANGELOG-v2.6.rst
@@ -2,6 +2,29 @@
 Ansible 2.6 "Heartbreaker" Release Notes
 ========================================
 
+v2.6.0rc2
+=========
+
+Release Summary
+---------------
+
+| Release Date: 2018-06-08
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
+
+
+Bugfixes
+--------
+
+- Changed the admin_users config option to not include "admin" by default as admin is frequently used for a non-privileged account  (https://github.com/ansible/ansible/pull/41164)
+- allow custom endpoints to be used in the aws_s3 module (https://github.com/ansible/ansible/pull/36832)
+- ansible-doc - fixed traceback on missing plugins (https://github.com/ansible/ansible/pull/41167)
+- cast the device_mapping volume size to an int in the ec2_ami module (https://github.com/ansible/ansible/pull/40938)
+- fix BotoCoreError exception handling
+- fix async for the aws_s3 module by adding async support to the action plugin (https://github.com/ansible/ansible/pull/40826)
+- fix decrypting vault files for the aws_s3 module (https://github.com/ansible/ansible/pull/39634)
+- fix errors with S3-compatible APIs if they cannot use ACLs for buckets or objects
+- fix permission handling to try to download a file even if the user does not have permission to list all objects in the bucket
+
 v2.6.0rc1
 =========
 
@@ -259,7 +282,6 @@ Bugfixes
 - file module - Fix error when running a task which assures a symlink to a nonexistent file exists for the second and subsequent times (https://github.com/ansible/ansible/issues/39558)
 - file module - The file module allowed the user to specify src as a parameter when state was not link or hard.  This is documented as only applying to state=link or state=hard but in previous Ansible, this could have an effect in rare cornercases.  For instance, "ansible -m file -a 'state=directory path=/tmp src=/var/lib'" would create /tmp/lib.  This has been disabled and a warning emitted (will change to an error in Ansible-2.10).
 - import/include - Ensure role handlers have the proper parent, allowing for correct attribute inheritance (https://github.com/ansible/ansible/pull/39426)
-- import/include - Update TaskInclude _raw_params with the expanded/templated path to file allowing nested includes using host vars in file (https://github.com/ansible/ansible/pull/39365)
 - import_playbook - Pass vars applied to import_playbook into parsing of the playbook as they may be needed to parse the imported plays (https://github.com/ansible/ansible/pull/39521)
 - include_role/import_role - Don't overwrite included role handlers with play handlers on parse (https://github.com/ansible/ansible/pull/39563)
 - include_role/import_role - Fix parameter templating (https://github.com/ansible/ansible/pull/36372)
diff --git a/changelogs/fragments/v2.6.0rc2_summary.yaml b/changelogs/fragments/v2.6.0rc2_summary.yaml
new file mode 100644
index 0000000000..6296178311
--- /dev/null
+++ b/changelogs/fragments/v2.6.0rc2_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2018-06-08
+   | `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..e280b00b08 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.0rc2'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'Heartbreaker'