From 4ad69240815bf3749f5144d95852bb99eb026518 Mon Sep 17 00:00:00 2001
From: Matt Davis <mrd@redhat.com>
Date: Thu, 21 Feb 2019 08:17:19 -0800
Subject: [PATCH] New release v2.5.15

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

diff --git a/changelogs/CHANGELOG-v2.5.rst b/changelogs/CHANGELOG-v2.5.rst
index a9853650ff0..bb8b7c40570 100644
--- a/changelogs/CHANGELOG-v2.5.rst
+++ b/changelogs/CHANGELOG-v2.5.rst
@@ -2,6 +2,30 @@
 Ansible 2.5 "Kashmir" Release Notes
 ===================================
 
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.15:
+
+v2.5.15
+=======
+
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.15_Release Summary:
+
+Release Summary
+---------------
+
+| Release Date: 2019-02-21
+| Security release for CVE-2019-3828 (https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2019-3828)
+
+
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.15_Bugfixes:
+
+Bugfixes
+--------
+
+- remote home directory - Disallow use of remote home directories that include relative pathing by means of `..` (CVE-2019-3828) (https://github.com/ansible/ansible/pull/52133)
+
+- always correctly template no log for tasks https://github.com/ansible/ansible/issues/43294
+
+
 .. _Ansible 2.5 "Kashmir" Release Notes_v2.5.14:
 
 v2.5.14
diff --git a/changelogs/fragments/v2.5.15_summary.yaml b/changelogs/fragments/v2.5.15_summary.yaml
new file mode 100644
index 00000000000..1d20deed77e
--- /dev/null
+++ b/changelogs/fragments/v2.5.15_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2019-02-21
+   | Security release for CVE-2019-3828 (https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2019-3828)
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 38402218343..dee8b95f1b1 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.14'
+__version__ = '2.5.15'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'Kashmir'