New release v2.5.2v2.5.2

8 files changed, 79 insertions, 1 deletions

diff --git a/RELEASES.txt b/RELEASES.txt
index 03906c4bbb..b3b9a4700d 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -4,6 +4,7 @@ Ansible Releases at a Glance
 VERSION  RELEASE     CODE NAME
 ++++++++++++++++++++++++++++++
 
+2.5.2    2018-04-26  "Kashmir"
 2.5.1    2018-04-18  "Kashmir"
 2.5.0    2018-03-22  "Kashmir"
 2.4.4    2018-04-04  "Dancing Days"
diff --git a/changelogs/CHANGELOG-v2.5.rst b/changelogs/CHANGELOG-v2.5.rst
index 500f042cf2..29416a3a58 100644
--- a/changelogs/CHANGELOG-v2.5.rst
+++ b/changelogs/CHANGELOG-v2.5.rst
@@ -2,6 +2,56 @@
 Ansible 2.5 "Kashmir" Release Notes
 ===================================
 
+v2.5.2
+======
+
+Release Summary
+---------------
+
+| Release Date: 2018-04-26
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
+
+
+Minor Changes
+-------------
+
+- Return virtual_facts after VMware platform detection, otherwise we're falling back to 'NA' for virtualization type and virtualization role.
+
+
+Bugfixes
+--------
+
+- copy - fixed copy to only follow symlinks for files in the non-recursive case
+
+- file - fixed the default follow behaviour of file to be true
+
+- docker modules - Error with useful message is both docker and docker-py are found to both be installed (https://github.com/ansible/ansible/pull/38884)
+
+- dynamic includes - Improved performance by fixing re-parenting on copy (https://github.com/ansible/ansible/pull/38747)
+
+- dynamic includes - Fix IncludedFile comparison for free strategy (https://github.com/ansible/ansible/pull/37083)
+
+- dynamic includes - Allow inheriting attributes from static parents (https://github.com/ansible/ansible/pull/38827)
+
+- Fix ios and iosxr terminal prompt regex (https://github.com/ansible/ansible/pull/39063)
+
+- set_fact/include_vars - allow incremental update for vars in loop (https://github.com/ansible/ansible/pull/38302)
+
+- cloudfront_distribution - support missing protocol versions (https://github.com/ansible/ansible/pull/38990)
+
+- slice filter - removed Ansible-provided impl in favor of Jinja builtin (https://github.com/ansible/ansible/pull/37944)
+
+- ovirt_host_networks - fix removing of network attachments (https://github.com/ansible/ansible/pull/38816)
+
+- ovirt_disk - support removing unmanaged networks (https://github.com/ansible/ansible/pull/38726)
+
+- ovirt_disk - FCP storage domains don't have to have target (https://github.com/ansible/ansible/pull/38882)
+
+- Ansible.ModuleUtils.FileUtil - support using Test-AnsiblePath with non file system providers (https://github.com/ansible/ansible/pull/39200)
+
+- win_get_url - Compare the UTC time of the web file to the local UTC time (https://github.com/ansible/ansible/pull/39152)
+
+
 v2.5.1
 ======
 
@@ -209,6 +259,12 @@ Bugfixes
 v2.5.0
 ======
 
+Release Summary
+---------------
+
+| Release Date: 2018-03-22
+
+
 Major Changes
 -------------
 
diff --git a/changelogs/fragments/v2.5.2_catchup.yaml b/changelogs/fragments/v2.5.2_catchup.yaml
new file mode 100644
index 0000000000..16382c7ec3
--- /dev/null
+++ b/changelogs/fragments/v2.5.2_catchup.yaml
@@ -0,0 +1,7 @@
+bugfixes:
+- cloudfront_distribution - support missing protocol versions (https://github.com/ansible/ansible/pull/38990)
+- slice filter - removed Ansible-provided impl in favor of Jinja builtin (https://github.com/ansible/ansible/pull/37944)
+- ovirt_host_networks - fix removing of network attachments (https://github.com/ansible/ansible/pull/38816)
+- ovirt_disk - support removing unmanaged networks (https://github.com/ansible/ansible/pull/38726)
+- ovirt_disk - FCP storage domains don't have to have target (https://github.com/ansible/ansible/pull/38882)
+
diff --git a/changelogs/fragments/v2.5.2_summary.yaml b/changelogs/fragments/v2.5.2_summary.yaml
new file mode 100644
index 0000000000..fb34410753
--- /dev/null
+++ b/changelogs/fragments/v2.5.2_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2018-04-26
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 79c5436dcb..aa552c314a 100644
--- a/lib/ansible/release.py
+++ b/lib/ansible/release.py
@@ -19,5 +19,5 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-__version__ = '2.5.1'
+__version__ = '2.5.2'
 __author__ = 'Ansible, Inc.'
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index dc673b01ef..0a6fedd5cc 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -5,6 +5,13 @@ ansible (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low
  -- Ansible, Inc. <info@ansible.com>  %DATE%
 
 
+ansible (2.5.1-1) unstable; urgency=low
+
+  * 2.5.1-1
+
+ -- Ansible, Inc. <info@ansible.com>  Thu, 19 Apr 2018 00:02:15 +0000 
+
+
 ansible (2.5.0-1) unstable; urgency=low
 
   * 2.5.0-1
diff --git a/packaging/release/vars/versions.yml b/packaging/release/vars/versions.yml
index 152df88f58..af554a22ab 100644
--- a/packaging/release/vars/versions.yml
+++ b/packaging/release/vars/versions.yml
@@ -4,6 +4,7 @@ versions:
     releases:
     - "0": "03-22-2018"
     - "1": "04-18-2018"
+    - "2": "04-26-2018"
 - "2.4":
     code_name: "Dancing Days"
     releases:
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 9f8069c46e..dba982ee2a 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -135,6 +135,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Thu Apr 26 2018 Ansible, Inc. <info@ansible.com> - 2.5.2-1
+- Release 2.5.2-1
+
 * Thu Apr 18 2018 Ansible, Inc. <info@ansible.com> - 2.5.1-1
 - Release 2.5.1-1