New release v2.5.1v2.5.1

24 files changed, 245 insertions, 37 deletions

diff --git a/RELEASES.txt b/RELEASES.txt
index a82467fe94..03906c4bbb 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -4,7 +4,9 @@ Ansible Releases at a Glance
 VERSION  RELEASE     CODE NAME
 ++++++++++++++++++++++++++++++
 
+2.5.1    2018-04-18  "Kashmir"
 2.5.0    2018-03-22  "Kashmir"
+2.4.4    2018-04-04  "Dancing Days"
 2.4.3    01-31.2018  "Dancing Days"
 2.4.2    11-29-2017  "Dancing Days"
 2.4.1    10-25-2017  "Dancing Days"
diff --git a/changelogs/CHANGELOG-v2.5.rst b/changelogs/CHANGELOG-v2.5.rst
index 61e7ea820e..500f042cf2 100644
--- a/changelogs/CHANGELOG-v2.5.rst
+++ b/changelogs/CHANGELOG-v2.5.rst
@@ -2,16 +2,213 @@
 Ansible 2.5 "Kashmir" Release Notes
 ===================================
 
-v2.5.0
+v2.5.1
 ======
 
 Release Summary
 ---------------
 
-| Release Date: 2018-03-22
+| Release Date: 2018-04-18
 | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
 
 
+Minor Changes
+-------------
+
+- Updated example in vcenter_license module.
+
+- Updated virtual machine facts with instanceUUID which is unique for each VM irrespective of name and BIOS UUID.
+
+
+Bugfixes
+--------
+
+- EOS can not check configuration without use of config session (ANSIBLE_EOS_USE_SESSIONS=0). Fix is to throw error when hiting into this exception case. Configs would neither be checked nor be played on the eos device.
+
+- Adds exception handling which is raised when user does not have correct set of permissions/privileges to read virtual machine facts.
+
+- onyx_pfc_interface - Add support for changes in pfc output in onyx 3.6.6000 https://github.com/ansible/ansible/pull/37651
+
+- Fix mlag summary json parsing for onyx version 3.6.6000 and above https://github.com/ansible/ansible/pull/38191
+
+- Update documentation related to datacenter in vmware_guest_find module. Mark datacenter as optional.
+
+- Set default network type as 'dhcp' if user has not specified any.
+
+- nmcli change default value of autoconnect
+
+- azure_rm_image - Allow Azure images to be created with tags, bug was introduced in Ansible v2.5.0
+
+- azure_rm_networkinterface - fixed examples in module documentation and added fix to allow an IP configuration with no public IP (https://github.com/ansible/ansible/pull/36824)
+
+- azure_rm_virtualmachine - removed docs note that says on marketplace images can be used, custom images were added in 2.5
+
+- Improve keyed groups for complex inventory
+
+- Made separator configurable
+
+- Fixed some exception types
+
+- Better error messages
+
+- backup options doc change to reflect backup directory location in case playbook is run from a role
+
+- filters - Don't overwrite builtin jinja2 filters with tests (https://github.com/ansible/ansible/pull/37881)
+
+- edgeos_command - add action plugin to backup config (https://github.com/ansible/ansible/pull/37619)
+
+- eos_vlan - fixed eos_vlan not working when having more than 6 interfaces (https://github.com/ansible/ansible/pull/38347)
+
+- Various grafana_* modules - Port away from the deprecated b64encodestring function to the b64encode function instead. (https://github.com/ansible/ansible/pull/38388)
+
+- include_role - Fix parameter templating (https://github.com/ansible/ansible/pull/36372)
+
+- include_vars - Call DataLoader.load with the correct signature to prevent hang on error processing (https://github.com/ansible/ansible/pull/38194)
+
+- ios_interface - neighbors option now include CDP neighbors (https://github.com/ansible/ansible/pull/37667)
+
+- ios_l2_interface - fix removal of trunk vlans (https://github.com/ansible/ansible/pull/37389)
+
+- Add supported connection in junos module documentation (https://github.com/ansible/ansible/pull/38813)
+
+- _nxos_switchport - fix removal of trunk vlans (https://github.com/ansible/ansible/pull/37328)
+
+- nxos_l2_interface - fix removal of trunk vlans (https://github.com/ansible/ansible/pull/37336)
+
+- nxos_snapshot - fix documentation and add required parameter logic (https://github.com/ansible/ansible/pull/37232, https://github.com/ansible/ansible/pull/37248)
+
+- Improve integration test - Ensure each transport test runs only once (https://github.com/ansible/ansible/pull/37462)
+
+- nxos_user - Integration test (https://github.com/ansible/ansible/pull/37852)
+
+- nxos_bgp_af - Fix UnboundLocalError (https://github.com/ansible/ansible/pull/37610)
+
+- nxos_vrf - Fix nxos_vrf issues (https://github.com/ansible/ansible/pull/37092)
+
+- nxos_vrf_af - Fix nxos_vrf_af issues (https://github.com/ansible/ansible/pull/37211)
+
+- nxos_udld - Fix nxos_udld issues (https://github.com/ansible/ansible/pull/37418)
+
+- nxos_vlan - Fix nxos_vlan issues (https://github.com/ansible/ansible/pull/38008)
+
+- nxos_vlan - nxos_vlan purge (https://github.com/ansible/ansible/pull/38202)
+
+- nxos_aaa_server - Fix nxos_aaa_server (https://github.com/ansible/ansible/pull/38117)
+
+- nxos_aaa_server_host - Fix nxos_aaa_server_host (https://github.com/ansible/ansible/pull/38188)
+
+- nxos_acl - Fix nxos_acl (https://github.com/ansible/ansible/pull/38283)
+
+- nxos_static_route - Fix nxos_static_route (https://github.com/ansible/ansible/pull/37614)
+
+- nxos_acl_interface test - Fix nxos_acl_interface test (https://github.com/ansible/ansible/pull/38230)
+
+- nxos_igmp - Fix nxos_igmp (https://github.com/ansible/ansible/pull/38496)
+
+- nxos_hsrp - Fix nxos_hsrp (https://github.com/ansible/ansible/pull/38410)
+
+- nxos_igmp_snooping - Fix nxos_igmp_snooping (https://github.com/ansible/ansible/pull/38566)
+
+- nxos_ntp_auth - Fix nxos_ntp_auth issues (https://github.com/ansible/ansible/pull/38824)
+
+- nxos_ntp_options - Fix nxos_ntp_options issues (https://github.com/ansible/ansible/pull/38695)
+
+- Fix onyx_config action plugin when used on Python 3 https://github.com/ansible/ansible/pull/38343
+
+- openssl_certificate - Handle dump() in check_mode https://github.com/ansible/ansible/pull/38386
+
+- Fix traceback when creating or stopping ovirt vms (https://github.com/ansible/ansible/pull/37249)
+
+- Fix for consul_kv idempotence on Python3 https://github.com/ansible/ansible/issues/35893
+
+- Fix csvfile lookup plugin when used on Python3 https://github.com/ansible/ansible/pull/37625
+
+- ec2 - Fix ec2 user_data parameter to properly convert to base64 on python3 (https://github.com/ansible/ansible/pull/37628)
+
+- Fix to send and receive bytes over a socket in the haproxy module which was causing tracebacks on Python3 https://github.com/ansible/ansible/pull/35176
+
+- jira module - Fix bytes/text handling for base64 encoding authentication tokens (https://github.com/ansible/ansible/pull/33862)
+
+- ansible-pull - fixed a bug checking for changes when we've pulled from the git repository on python3 https://github.com/ansible/ansible/issues/36962
+
+- Fix bytes/text handling in vagrant dynamic inventory https://github.com/ansible/ansible/pull/37631
+
+- wait_for_connection - Fix python3 compatibility bug (https://github.com/ansible/ansible/pull/37646)
+
+- restore stderr ouput even if script module run is successful (https://github.com/ansible/ansible/pull/38177)
+
+- ec2_asg - no longer terminates an instance before creating a replacement (https://github.com/ansible/ansible/pull/36679)
+
+- ec2_group - security groups in default VPCs now have a default egress rule (https://github.com/ansible/ansible/pull/38018)
+
+- inventory correctly removes hosts from 'ungrouped' group (https://github.com/ansible/ansible/pull/37617)
+
+- letsencrypt - fixed domain matching authorization (https://github.com/ansible/ansible/pull/37558)
+
+- letsencrypt - improved elliptic curve account key parsing (https://github.com/ansible/ansible/pull/37275)
+
+- facts are no longer processed more than once for each action (https://github.com/ansible/ansible/issues/37535)
+
+- cs_vpc_offering - only return VPC offferings matching name arg (https://github.com/ansible/ansible/pull/37783)
+
+- cs_configuration - filter names inside the module instead of relying on API (https://github.com/ansible/ansible/pull/37910)
+
+- various fixes to networking module connection subsystem (https://github.com/ansible/ansible/pull/37529)
+
+- ios_* - fixed netconf issues (https://github.com/ansible/ansible/pull/38155)
+
+- ovirt_* - various bugfixes (https://github.com/ansible/ansible/pull/38341)
+
+- ansible-vault no longer requires '--encrypt-vault-id' with edit (https://github.com/ansible/ansible/pull/35923)
+
+- k8s lookup plugin now uses same auth method as other k8s modules (https://github.com/ansible/ansible/pull/37533)
+
+- ansible-inventory now properly displays group_var graph (https://github.com/ansible/ansible/pull/38744)
+
+- setup - FreeBSD fact gathering no longer fails on missing dmesg, sysctl, etc (https://github.com/ansible/ansible/pull/37194)
+
+- inventory scripts now read passwords without byte interpolation (https://github.com/ansible/ansible/pull/35582)
+
+- user - fixed password expiration support in FreeBSD
+
+- meta - inventory_refresh now works properly on YAML inventory plugins (https://github.com/ansible/ansible/pull/38242)
+
+- foreman callback plugin - fixed API options (https://github.com/ansible/ansible/pull/38138)
+
+- win_certificate_store - fixed a typo that stopped it from getting the key_storage values
+
+- win_copy - Preserve the local tmp folder instead of deleting it so future tasks can use it (https://github.com/ansible/ansible/pull/37964)
+
+- powershell - fixed issue with passing in a bool and int to the Windows environment block, also allow special chars in the env key name (https://github.com/ansible/ansible/pull/37215)
+
+- Ansible.ModuleUtils.FileUtil - Catch DirectoryNotFoundException with Test-AnsiblePath (https://github.com/ansible/ansible/pull/37968)
+
+- win_exec_wrapper - support loading of Windows modules different different line endings than the core modules (https://github.com/ansible/ansible/pull/37291)
+
+- win_reboot - fix deprecated warning message to show version in correct spot (https://github.com/ansible/ansible/pull/37898)
+
+- win_regedit - wait for garbage collection to finish before trying to unload the hive in case handles didn't unload in time (https://github.com/ansible/ansible/pull/38912)
+
+- win_service - Fix bug with win_service not being able to handle special chars like '[' (https://github.com/ansible/ansible/pull/37897)
+
+- win_setup - Use connection name for network interfaces as interface name isn't helpful (https://github.com/ansible/ansible/pull/37327)
+
+- win_setup - fix bug where getting the machine SID would take a long time in large domain environments (https://github.com/ansible/ansible/pull/38646)
+
+- win_updates - handle if the module fails to load and return the error message (https://github.com/ansible/ansible/pull/38363)
+
+- win_uri - do not override existing header when using the ``headers`` key. (https://github.com/ansible/ansible/pull/37845)
+
+- win_uri - convert status code values to an int before validating them in server response (https://github.com/ansible/ansible/pull/38080)
+
+- windows - display UTF-8 characters correctly in Windows return json (https://github.com/ansible/ansible/pull/37229)
+
+- winrm - when managing Kerberos tickets in Ansible, get a forwardable ticket if delegation is set (https://github.com/ansible/ansible/pull/37815)
+
+
+v2.5.0
+======
+
 Major Changes
 -------------
 
@@ -642,7 +839,7 @@ Bugfixes
 
 - znode - fixed a bug calling the zookeeper API under Python3 https://github.com/ansible/ansible/pull/36999
 
-- Fix for unarchive when users use the --strip-components extra_opt to tar causing ansible to set permissions on the wrong directory. https://github.com/ansible/ansible/pull/37048
+- Fix for unarchive when users use the --strip-components extra_opt to tar causing ansible to set permissions on the wrong directory. (https://github.com/ansible/ansible/pull/37048)
 
 - fixed templating issues in loop_control (https://github.com/ansible/ansible/pull/36124)
 
diff --git a/changelogs/fragments/grafana-deprecation-warnings.yaml b/changelogs/fragments/grafana-deprecation-warnings.yaml
index dd6dac0cc8..42a11ae8c4 100644
--- a/changelogs/fragments/grafana-deprecation-warnings.yaml
+++ b/changelogs/fragments/grafana-deprecation-warnings.yaml
@@ -1,4 +1,3 @@
 ---
 bugfixes:
-- Various grafana_* modules - Port away from the deprecated b64encodestring
-  function to the b64encode function instead. https://github.com/ansible/ansible/pull/38388
+- Various grafana_* modules - Port away from the deprecated b64encodestring function to the b64encode function instead. (https://github.com/ansible/ansible/pull/38388)
diff --git a/changelogs/fragments/no-template-conn-err.yaml b/changelogs/fragments/no-template-conn-err.yaml
index 6b8b4e3198..63da9195bf 100644
--- a/changelogs/fragments/no-template-conn-err.yaml
+++ b/changelogs/fragments/no-template-conn-err.yaml
@@ -1,4 +1,2 @@
 bugfixes:
-  - Connection error messages may contain characters that jinja2 would
-    interpret as a template.  Wrap the error string so this doesn't happen
-    (https://github.com/ansible/ansible/pull/37329)
+  - Connection error messages may contain characters that jinja2 would interpret as a template.  Wrap the error string so this doesn't happen (https://github.com/ansible/ansible/pull/37329)
diff --git a/changelogs/fragments/py3-ansible_interpreter.yaml b/changelogs/fragments/py3-ansible_interpreter.yaml
index 7f92f62379..528263c3d1 100644
--- a/changelogs/fragments/py3-ansible_interpreter.yaml
+++ b/changelogs/fragments/py3-ansible_interpreter.yaml
@@ -1,4 +1,2 @@
 bugfixes:
-- Fix for ansible_*_interpreter on Python3 when using non-newstyle modules.
-  Those include old-style ansible modules and Ansible modules written in
-  non-python scripting languages (https://github.com/ansible/ansible/pull/36541)
+- Fix for ansible_*_interpreter on Python3 when using non-newstyle modules. Those include old-style ansible modules and Ansible modules written in non-python scripting languages (https://github.com/ansible/ansible/pull/36541)
diff --git a/changelogs/fragments/py3-haproxy.yaml b/changelogs/fragments/py3-haproxy.yaml
index 145815d31b..56b1cc89f3 100644
--- a/changelogs/fragments/py3-haproxy.yaml
+++ b/changelogs/fragments/py3-haproxy.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- Fix to send and receive bytes over a socket in the haproxy module which was
-  causing tracebacks on Python3 https://github.com/ansible/ansible/pull/35176
+- Fix to send and receive bytes over a socket in the haproxy module which was causing tracebacks on Python3 https://github.com/ansible/ansible/pull/35176
diff --git a/changelogs/fragments/py3-jira.yaml b/changelogs/fragments/py3-jira.yaml
index 09846e6b9a..3dd7cff0a2 100644
--- a/changelogs/fragments/py3-jira.yaml
+++ b/changelogs/fragments/py3-jira.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- jira module - Fix bytes/text handling for base64 encoding authentication tokens
-  https://github.com/ansible/ansible/pull/33862
+- jira module - Fix bytes/text handling for base64 encoding authentication tokens (https://github.com/ansible/ansible/pull/33862)
diff --git a/changelogs/fragments/unarchive-absolute-path.yaml b/changelogs/fragments/unarchive-absolute-path.yaml
index 44f5367723..46ae618b92 100644
--- a/changelogs/fragments/unarchive-absolute-path.yaml
+++ b/changelogs/fragments/unarchive-absolute-path.yaml
@@ -1,5 +1,3 @@
 ---
 bugfixes:
-- Fix for unarchive when users use the --strip-components extra_opt to tar
-  causing ansible to set permissions on the wrong directory.
-  https://github.com/ansible/ansible/pull/37048
+- Fix for unarchive when users use the --strip-components extra_opt to tar causing ansible to set permissions on the wrong directory. (https://github.com/ansible/ansible/pull/37048)
diff --git a/changelogs/fragments/v2.5.0_summary.yaml b/changelogs/fragments/v2.5.0_summary.yaml
index 6a990b55fe..3389153797 100644
--- a/changelogs/fragments/v2.5.0_summary.yaml
+++ b/changelogs/fragments/v2.5.0_summary.yaml
@@ -1,3 +1,2 @@
 release_summary: |
    | Release Date: 2018-03-22
-   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
diff --git a/changelogs/fragments/v2.5.1_catchup.yaml b/changelogs/fragments/v2.5.1_catchup.yaml
new file mode 100644
index 0000000000..27f391f40e
--- /dev/null
+++ b/changelogs/fragments/v2.5.1_catchup.yaml
@@ -0,0 +1,20 @@
+bugfixes:
+- ec2_asg - no longer terminates an instance before creating a replacement (https://github.com/ansible/ansible/pull/36679)
+- ec2_group - security groups in default VPCs now have a default egress rule (https://github.com/ansible/ansible/pull/38018)
+- inventory correctly removes hosts from 'ungrouped' group (https://github.com/ansible/ansible/pull/37617)
+- letsencrypt - fixed domain matching authorization (https://github.com/ansible/ansible/pull/37558)
+- letsencrypt - improved elliptic curve account key parsing (https://github.com/ansible/ansible/pull/37275)
+- facts are no longer processed more than once for each action (https://github.com/ansible/ansible/issues/37535)
+- cs_vpc_offering - only return VPC offferings matching name arg (https://github.com/ansible/ansible/pull/37783)
+- cs_configuration - filter names inside the module instead of relying on API (https://github.com/ansible/ansible/pull/37910)
+- various fixes to networking module connection subsystem (https://github.com/ansible/ansible/pull/37529)
+- ios_* - fixed netconf issues (https://github.com/ansible/ansible/pull/38155)
+- ovirt_* - various bugfixes (https://github.com/ansible/ansible/pull/38341)
+- ansible-vault no longer requires '--encrypt-vault-id' with edit (https://github.com/ansible/ansible/pull/35923)
+- k8s lookup plugin now uses same auth method as other k8s modules (https://github.com/ansible/ansible/pull/37533)
+- ansible-inventory now properly displays group_var graph (https://github.com/ansible/ansible/pull/38744)
+- setup - FreeBSD fact gathering no longer fails on missing dmesg, sysctl, etc (https://github.com/ansible/ansible/pull/37194)
+- inventory scripts now read passwords without byte interpolation (https://github.com/ansible/ansible/pull/35582)
+- user - fixed password expiration support in FreeBSD
+- meta - inventory_refresh now works properly on YAML inventory plugins (https://github.com/ansible/ansible/pull/38242)
+- foreman callback plugin - fixed API options (https://github.com/ansible/ansible/pull/38138)
diff --git a/changelogs/fragments/v2.5.1_summary.yaml b/changelogs/fragments/v2.5.1_summary.yaml
new file mode 100644
index 0000000000..512dc0bb2f
--- /dev/null
+++ b/changelogs/fragments/v2.5.1_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2018-04-18
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
diff --git a/changelogs/fragments/win_copy-preserve-tmp-folder.yaml b/changelogs/fragments/win_copy-preserve-tmp-folder.yaml
index ea6a93e2af..e0c361371e 100644
--- a/changelogs/fragments/win_copy-preserve-tmp-folder.yaml
+++ b/changelogs/fragments/win_copy-preserve-tmp-folder.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- win_copy - Preserve the local tmp folder instead of deleting it so future tasks can use it
-  https://github.com/ansible/ansible/pull/37964
+- win_copy - Preserve the local tmp folder instead of deleting it so future tasks can use it (https://github.com/ansible/ansible/pull/37964)
diff --git a/changelogs/fragments/win_environment-stringify-2.5 b/changelogs/fragments/win_environment-stringify-2.5.yaml
index faf7482f30..faf7482f30 100644
--- a/changelogs/fragments/win_environment-stringify-2.5
+++ b/changelogs/fragments/win_environment-stringify-2.5.yaml
diff --git a/changelogs/fragments/win_file_util-test-exception-handler.yaml b/changelogs/fragments/win_file_util-test-exception-handler.yaml
index 03082c2de1..87af42f8e0 100644
--- a/changelogs/fragments/win_file_util-test-exception-handler.yaml
+++ b/changelogs/fragments/win_file_util-test-exception-handler.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- Ansible.ModuleUtils.FileUtil - Catch DirectoryNotFoundException with Test-AnsiblePath
-  https://github.com/ansible/ansible/pull/37968
+- Ansible.ModuleUtils.FileUtil - Catch DirectoryNotFoundException with Test-AnsiblePath (https://github.com/ansible/ansible/pull/37968)
diff --git a/changelogs/fragments/win_modules-support-different-line-endings.yaml b/changelogs/fragments/win_modules-support-different-line-endings.yaml
index 5cade744bc..d688d5bef6 100644
--- a/changelogs/fragments/win_modules-support-different-line-endings.yaml
+++ b/changelogs/fragments/win_modules-support-different-line-endings.yaml
@@ -1,2 +1,2 @@
-bugfixes
+bugfixes:
 - win_exec_wrapper - support loading of Windows modules different different line endings than the core modules (https://github.com/ansible/ansible/pull/37291)
diff --git a/changelogs/fragments/win_reboot-warning-message-fix.yaml b/changelogs/fragments/win_reboot-warning-message-fix.yaml
index 7f5fe65ba0..b55c6e0ccd 100644
--- a/changelogs/fragments/win_reboot-warning-message-fix.yaml
+++ b/changelogs/fragments/win_reboot-warning-message-fix.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- win_reboot - fix deprecated warning message to show version in correct spot
-  https://github.com/ansible/ansible/pull/37898
+- win_reboot - fix deprecated warning message to show version in correct spot (https://github.com/ansible/ansible/pull/37898)
diff --git a/changelogs/fragments/win_service-name-special-chars.yaml b/changelogs/fragments/win_service-name-special-chars.yaml
index d84d95db27..7802fc06d0 100644
--- a/changelogs/fragments/win_service-name-special-chars.yaml
+++ b/changelogs/fragments/win_service-name-special-chars.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- win_service - Fix bug with win_service not being able to handle special chars like [ 
-  (https://github.com/ansible/ansible/pull/37897)
+- win_service - Fix bug with win_service not being able to handle special chars like '[' (https://github.com/ansible/ansible/pull/37897)
diff --git a/changelogs/fragments/win_setup-connection-name.yaml b/changelogs/fragments/win_setup-connection-name.yaml
index 960ea7347a..2a119e7342 100644
--- a/changelogs/fragments/win_setup-connection-name.yaml
+++ b/changelogs/fragments/win_setup-connection-name.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- win_setup - Use connection name for network interfaces as interface name isn't helpful
-  https://github.com/ansible/ansible/pull/37327
+- win_setup - Use connection name for network interfaces as interface name isn't helpful (https://github.com/ansible/ansible/pull/37327)
diff --git a/changelogs/fragments/win_updates_handle-module-failures.yaml b/changelogs/fragments/win_updates_handle-module-failures.yaml
index 044ed3bd08..177b3aa6de 100644
--- a/changelogs/fragments/win_updates_handle-module-failures.yaml
+++ b/changelogs/fragments/win_updates_handle-module-failures.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- win_updates - handle if the module fails to load and return the error message
-  https://github.com/ansible/ansible/pull/38363
+- win_updates - handle if the module fails to load and return the error message (https://github.com/ansible/ansible/pull/38363)
diff --git a/changelogs/fragments/win_uri-fix-header-override.yaml b/changelogs/fragments/win_uri-fix-header-override.yaml
index edbb288cbf..efbcbe31b6 100644
--- a/changelogs/fragments/win_uri-fix-header-override.yaml
+++ b/changelogs/fragments/win_uri-fix-header-override.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- win_uri - do not override existing header when using the ``headers`` key.
-  https://github.com/ansible/ansible/pull/37845
+- win_uri - do not override existing header when using the ``headers`` key. (https://github.com/ansible/ansible/pull/37845)
diff --git a/changelogs/fragments/win_utf8_character_output.yaml b/changelogs/fragments/win_utf8_character_output.yaml
index 665d2c636d..2b9181586a 100644
--- a/changelogs/fragments/win_utf8_character_output.yaml
+++ b/changelogs/fragments/win_utf8_character_output.yaml
@@ -1,3 +1,2 @@
 bugfixes:
-- windows - display UTF-8 characters correctly in Windows return json
-  https://github.com/ansible/ansible/pull/37229
+- windows - display UTF-8 characters correctly in Windows return json (https://github.com/ansible/ansible/pull/37229)
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index e19d40e1f2..79c5436dcb 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.0'
+__version__ = '2.5.1'
 __author__ = 'Ansible, Inc.'
diff --git a/packaging/release/vars/versions.yml b/packaging/release/vars/versions.yml
index ef500bdd6f..152df88f58 100644
--- a/packaging/release/vars/versions.yml
+++ b/packaging/release/vars/versions.yml
@@ -3,6 +3,7 @@ versions:
     code_name: "Kashmir"
     releases:
     - "0": "03-22-2018"
+    - "1": "04-18-2018"
 - "2.4":
     code_name: "Dancing Days"
     releases:
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 3ad24510a6..9f8069c46e 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -135,6 +135,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Thu Apr 18 2018 Ansible, Inc. <info@ansible.com> - 2.5.1-1
+- Release 2.5.1-1
+
 * Thu Mar 22 2018 Ansible, Inc. <info@ansible.com> - 2.5.0-1
 - Release 2.5.0-1