From 619c4173ea0b915de211b8c665cd9cbc170e4215 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Thu, 29 Nov 2018 12:56:42 -0800
Subject: [PATCH] New release v2.6.9

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

diff --git a/changelogs/.changes.yaml b/changelogs/.changes.yaml
index 7cf459659b..11affb7245 100644
--- a/changelogs/.changes.yaml
+++ b/changelogs/.changes.yaml
@@ -543,3 +543,14 @@ releases:
     - v2.6.8_summary.yaml
     - win_uri-junk-data.yaml
     release_date: '2018-11-15'
+  2.6.9:
+    codename: Heartbreaker
+    fragments:
+    - 44726-correct_deprecate_call.yaml
+    - 48580-apt_key-no-tty.yaml
+    - 48808-sysvinit_defaults_if_no_runlevels.yaml
+    - ps_sb_logging.yaml
+    - user-fix-zero-negative-expiration.yaml
+    - user-password_lock-change-fix.yaml
+    - v2.6.9_summary.yaml
+    release_date: '2018-11-29'
diff --git a/changelogs/CHANGELOG-v2.6.rst b/changelogs/CHANGELOG-v2.6.rst
index d148b6898c..bee996bce7 100644
--- a/changelogs/CHANGELOG-v2.6.rst
+++ b/changelogs/CHANGELOG-v2.6.rst
@@ -2,6 +2,26 @@
 Ansible 2.6 "Heartbreaker" Release Notes
 ========================================
 
+v2.6.9
+======
+
+Release Summary
+---------------
+
+| Release Date: 2018-11-29
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+
+Bugfixes
+--------
+
+- Fix calling deprecate with correct arguments (https://github.com/ansible/ansible/pull/46062).
+- Windows - prevent sensitive content from appearing in scriptblock logging (CVE 2018-16859)
+- apt_key - Disable TTY requirement in GnuPG for the module to work correctly when SSH pipelining is enabled (https://github.com/ansible/ansible/pull/48580)
+- sysvinit - enabling a service should use "defaults" if no runlevels are specified
+- user - do not report changes every time when setting password_lock (https://github.com/ansible/ansible/issues/43670)
+- user - properly remove expiration when set to a negative value (https://github.com/ansible/ansible/issues/47114)
+
 v2.6.8
 ======
 
diff --git a/changelogs/fragments/v2.6.9_summary.yaml b/changelogs/fragments/v2.6.9_summary.yaml
new file mode 100644
index 0000000000..d21d39b440
--- /dev/null
+++ b/changelogs/fragments/v2.6.9_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2018-11-29
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 3282914b03..fead169a4e 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.8.post0'
+__version__ = '2.6.9'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'Heartbreaker'