From 1b7828561e8341008e5c831319b70181185f4cfa Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <a.badger@gmail.com>
Date: Thu, 23 May 2019 10:43:59 -0700
Subject: New release v2.6.17

---
 changelogs/.changes.yaml                  | 10 ++++++++++
 changelogs/CHANGELOG-v2.6.rst             | 19 +++++++++++++++++++
 changelogs/fragments/v2.6.17_summary.yaml |  3 +++
 lib/ansible/release.py                    |  2 +-
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/v2.6.17_summary.yaml

diff --git a/changelogs/.changes.yaml b/changelogs/.changes.yaml
index 73990ba364..92234283ab 100644
--- a/changelogs/.changes.yaml
+++ b/changelogs/.changes.yaml
@@ -433,6 +433,16 @@ releases:
     - win_user_right-output.yaml
     - winrm-all-timeout-exceptions.yaml
     release_date: '2019-04-03'
+  2.6.17:
+    codename: Heartbreaker
+    fragments:
+    - 44412-copy-fix-unwanted-acls.yaml
+    - 55150-native-strings-for-signature-auth.yaml
+    - pamd-make-idempotence-fix.yaml
+    - v2.6.17_summary.yaml
+    - win_acl-network.yaml
+    - win_domain-setup.yaml
+    release_date: '2019-05-23'
   2.6.2:
     codename: Heartbreaker
     fragments:
diff --git a/changelogs/CHANGELOG-v2.6.rst b/changelogs/CHANGELOG-v2.6.rst
index c752c302e6..011c42486b 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.17
+=======
+
+Release Summary
+---------------
+
+| Release Date: 2019-05-23
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+
+Bugfixes
+--------
+
+- Backport of https://github.com/ansible/ansible/pull/54105, pamd - fix idempotence issue when removing rules
+- Fix unwanted ACLs when using copy module (https://github.com/ansible/ansible/issues/44412)
+- aci modules - Ensure we use native strings for signature
+- win_acl - Fix qualifier parser when using UNC paths - https://github.com/ansible/ansible/issues/55875
+- win_domain - Fix checking for a domain introduced in a recent patch
+
 v2.6.16
 =======
 
diff --git a/changelogs/fragments/v2.6.17_summary.yaml b/changelogs/fragments/v2.6.17_summary.yaml
new file mode 100644
index 0000000000..9ac5505887
--- /dev/null
+++ b/changelogs/fragments/v2.6.17_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2019-05-23
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index f68dcd0995..b471b0c835 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.16.post0'
+__version__ = '2.6.17'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'Heartbreaker'
-- 
cgit v1.2.1