From f21dfd85cdfb5923eefcddf849515a9f47f747a7 Mon Sep 17 00:00:00 2001
From: Matt Davis <mrd@redhat.com>
Date: Wed, 31 Oct 2018 10:00:14 -0700
Subject: [PATCH] New release v2.5.11

---
 changelogs/CHANGELOG-v2.5.rst             | 22 ++++++++++++++++++++++
 changelogs/fragments/v2.5.11_summary.yaml |  3 +++
 lib/ansible/release.py                    |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/v2.5.11_summary.yaml

diff --git a/changelogs/CHANGELOG-v2.5.rst b/changelogs/CHANGELOG-v2.5.rst
index ea8a08fd0b6..91064d159e7 100644
--- a/changelogs/CHANGELOG-v2.5.rst
+++ b/changelogs/CHANGELOG-v2.5.rst
@@ -2,6 +2,28 @@
 Ansible 2.5 "Kashmir" Release Notes
 ===================================
 
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.11:
+
+v2.5.11
+=======
+
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.11_Release Summary:
+
+Release Summary
+---------------
+
+| Release Date: 2018-10-31
+| Security release for CVE-2018-16837 (https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2018-16837)
+
+
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.11_Bugfixes:
+
+Bugfixes
+--------
+
+- user module - do not pass ssh_key_passphrase on cmdline (CVE-2018-16837)
+
+
 .. _Ansible 2.5 "Kashmir" Release Notes_v2.5.10:
 
 v2.5.10
diff --git a/changelogs/fragments/v2.5.11_summary.yaml b/changelogs/fragments/v2.5.11_summary.yaml
new file mode 100644
index 00000000000..efa42adda07
--- /dev/null
+++ b/changelogs/fragments/v2.5.11_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2018-10-31
+   | Security release for CVE-2018-16837 (https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2018-16837)
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 725918aaece..353af93349a 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.5.10'
+__version__ = '2.5.11'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'Kashmir'