From 1a6fe6cc05c9e8edbe66866a2c3bbedb00e9b347 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Thu, 5 Jul 2018 11:48:35 -0700
Subject: [PATCH] New release v2.6.1

---
 changelogs/.changes.yaml                 | 14 +++++++++++
 changelogs/CHANGELOG-v2.6.rst            | 31 ++++++++++++++++++++++--
 changelogs/fragments/v2.6.1_summary.yaml |  3 +++
 lib/ansible/release.py                   |  2 +-
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/fragments/v2.6.1_summary.yaml

diff --git a/changelogs/.changes.yaml b/changelogs/.changes.yaml
index ee461aec79a87f..e9fd20c643bc88 100644
--- a/changelogs/.changes.yaml
+++ b/changelogs/.changes.yaml
@@ -331,3 +331,17 @@ releases:
     - v2.6.0rc5_summary.yaml
     - win_iis_webapppool-output-fix.yml
     release_date: '2018-06-26'
+  2.6.1:
+    codename: Heartbreaker
+    fragments:
+    - avoid_cwd_vars.yml
+    - basic_booleans_backward_compat.yaml
+    - file_touch_check_mode.yaml
+    - inventory_manager_fix_required_options_override.yaml
+    - junos_config_confirm_commit.yaml
+    - nsupdate_fix_hmac-sha384.yaml
+    - v2.6.1_summary.yaml
+    - win_domain-dns-typo-fix.yml
+    - win_group_membership-sid-bugfix.yml
+    - wrcwd_ansible.cfg.yml
+    release_date: '2018-07-05'
diff --git a/changelogs/CHANGELOG-v2.6.rst b/changelogs/CHANGELOG-v2.6.rst
index e03c7c78be48ac..394ad31892d43c 100644
--- a/changelogs/CHANGELOG-v2.6.rst
+++ b/changelogs/CHANGELOG-v2.6.rst
@@ -2,6 +2,33 @@
 Ansible 2.6 "Heartbreaker" Release Notes
 ========================================
 
+v2.6.1
+======
+
+Release Summary
+---------------
+
+| Release Date: 2018-07-05
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
+
+
+Minor Changes
+-------------
+
+- Restore module_utils.basic.BOOLEANS variable for backwards compatibility with the module API in older ansible releases.
+
+Bugfixes
+--------
+
+- **Security Fix** - avoid loading host/group vars from cwd when not specifying a playbook or playbook base dir
+- **Security Fix** - avoid using ansible.cfg in a world writable dir.
+- Fix junos_config confirm commit timeout issue (https://github.com/ansible/ansible/pull/41527)
+- file module - The touch subcommand had its diff output broken during the 2.6.x development cycle.  The patch to fix that broke check mode. This is now fixed (https://github.com/ansible/ansible/issues/42111)
+- inventory manager - This fixes required options being populated before the inventory config file is read, so the required options may be set in the config file.
+- nsupdate - allow hmac-sha384 https://github.com/ansible/ansible/pull/42209
+- win_domain - fixes typo in one of the AD cmdlets https://github.com/ansible/ansible/issues/41536
+- win_group_membership - uses the internal Ansible SID conversion logic and uses that when comparing group membership instead of the name https://github.com/ansible/ansible/issues/40649
+
 v2.6.0
 ======
 
@@ -393,8 +420,8 @@ f5
 files
 ^^^^^
 
-- net_get - Copy files from a network device to Ansible Controller
-- net_put - Copy files from Ansibe controller to a network device
+- net_get - Copy a file from a network device to Ansible Controller
+- net_put - Copy a file from Ansible Controller to a network device
 
 fortios
 ^^^^^^^
diff --git a/changelogs/fragments/v2.6.1_summary.yaml b/changelogs/fragments/v2.6.1_summary.yaml
new file mode 100644
index 00000000000000..e8f2db4d882580
--- /dev/null
+++ b/changelogs/fragments/v2.6.1_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2018-07-05
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index b18f664ebb2af4..f8276f9a375115 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.1'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'Heartbreaker'