From 9917d648e544661449acd6433e4e573428d4609f Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Mon, 25 Jun 2018 16:22:04 -0700
Subject: [PATCH] New release v2.6.0rc4

---
 changelogs/.changes.yaml                    | 16 ++++++++++++
 changelogs/CHANGELOG-v2.6.rst               | 29 +++++++++++++++++++++
 changelogs/fragments/v2.6.0rc4_summary.yaml |  3 +++
 lib/ansible/release.py                      |  2 +-
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/v2.6.0rc4_summary.yaml

diff --git a/changelogs/.changes.yaml b/changelogs/.changes.yaml
index f6b55912655..76ffbf3588d 100644
--- a/changelogs/.changes.yaml
+++ b/changelogs/.changes.yaml
@@ -300,3 +300,19 @@ releases:
     - reset_con_fix.yml
     - v2.6.0rc3_summary.yaml
     release_date: '2018-06-18'
+  2.6.0rc4:
+    codename: Heartbreaker
+    fragments:
+    - 41530-apt-mark-deb6.yaml
+    - debug_fixes.yml
+    - eos_vrf_failure-fix.yml
+    - file_touch_diff.yaml
+    - fix_config_required.yml
+    - fix_yaml_inv_nulls.yml
+    - missing_raise.yml
+    - v2.6.0rc4_summary.yaml
+    - vars_lk.yml
+    - virtualbox_inventory.yaml
+    - win_updates-async-fix.yml
+    - winrm_kinit-remove-pass-log.yml
+    release_date: '2018-06-25'
diff --git a/changelogs/CHANGELOG-v2.6.rst b/changelogs/CHANGELOG-v2.6.rst
index 216b4f85868..20e7a5fdef6 100644
--- a/changelogs/CHANGELOG-v2.6.rst
+++ b/changelogs/CHANGELOG-v2.6.rst
@@ -2,6 +2,35 @@
 Ansible 2.6 "Heartbreaker" Release Notes
 ========================================
 
+v2.6.0rc4
+=========
+
+Release Summary
+---------------
+
+| Release Date: 2018-06-25
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
+
+
+Minor Changes
+-------------
+
+- Raise AnsibleParserError which was missing previously
+
+Bugfixes
+--------
+
+- Changed the output to "text" for "show vrf" command as default "json" output format with respect to "eapi" transport was failing (https://github.com/ansible/ansible/pull/41470)
+- added missing 'raise' to exception definition https://github.com/ansible/ansible/pull/41690
+- correct debug display for all cases https://github.com/ansible/ansible/pull/41331
+- correctly check hostvars for vars term https://github.com/ansible/ansible/pull/41819
+- correctly handle yaml inventory files when entries are null dicts https://github.com/ansible/ansible/issues/41692
+- file module - The touch subcommand had its diff output broken during the 2.6.x development cycle.  This is now fixed (https://github.com/ansible/ansible/issues/41755)
+- fix apt-mark on debian6 (https://github.com/ansible/ansible/pull/41530)
+- fixed config required handling, specifically for _terms in lookups https://github.com/ansible/ansible/pull/41740
+- win_updates - Fixed issue where running win_updates on async fails without any error
+- winrm - ensure pexpect is set to not echo the input on a failure and have a manual sanity check afterwards https://github.com/ansible/ansible/issues/41865
+
 v2.6.0rc3
 =========
 
diff --git a/changelogs/fragments/v2.6.0rc4_summary.yaml b/changelogs/fragments/v2.6.0rc4_summary.yaml
new file mode 100644
index 00000000000..fb1981c7707
--- /dev/null
+++ b/changelogs/fragments/v2.6.0rc4_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2018-06-25
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 0d42dfbcac7..e598baa1fe6 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.0rc3.dev0'
+__version__ = '2.6.0rc4'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'Heartbreaker'