New release v2.5.0v2.5.0

10 files changed, 327 insertions, 163 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index ec7df7d4db..deee3ff1f6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -15,7 +15,6 @@ recursive-include licenses *
 recursive-include packaging *
 recursive-include test *
 include Makefile
-include VERSION
 include MANIFEST.in
 include changelogs/*.rst
 include contrib/README.md
diff --git a/Makefile b/Makefile
index cad1e3016d..c495ca0943 100644
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,7 @@ sdist_upload: clean docs
 # TODO: variable-ize major version number usages here
 .PHONY: changelog_reno
 changelog_reno:
-	reno -d changelogs/ report --title 'Ansible 2.5 "Kashmir" Release Notes' --no-collapse-pre-release --no-show-source --earliest-version v2.5.0b1 --output changelogs/CHANGELOG-v2.5.rst
+	reno -d changelogs/ report --title 'Ansible 2.5 "Kashmir" Release Notes' --collapse-pre-release --no-show-source --earliest-version v2.5.0b1 --output changelogs/CHANGELOG-v2.5.rst
 
 .PHONY: changelog_aggregate
 changelog_aggregate:
diff --git a/RELEASES.txt b/RELEASES.txt
index 6ea409f92b..a82467fe94 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -4,11 +4,12 @@ Ansible Releases at a Glance
 VERSION  RELEASE     CODE NAME
 ++++++++++++++++++++++++++++++
 
-2.5.0    TBD         "Kashmir"
+2.5.0    2018-03-22  "Kashmir"
 2.4.3    01-31.2018  "Dancing Days"
 2.4.2    11-29-2017  "Dancing Days"
 2.4.1    10-25-2017  "Dancing Days"
 2.4.0    09-19-2017  "Dancing Days"
+2.3.3    12-20-2017  "Ramble On"
 2.3.2    2017-08-04  "Ramble On"
 2.3.1    2017-06-01  "Ramble On"
 2.3.0    2017-04-12  "Ramble On"
diff --git a/changelogs/CHANGELOG-v2.5.rst b/changelogs/CHANGELOG-v2.5.rst
index f9dd57f4ee..61e7ea820e 100644
--- a/changelogs/CHANGELOG-v2.5.rst
+++ b/changelogs/CHANGELOG-v2.5.rst
@@ -2,32 +2,16 @@
 Ansible 2.5 "Kashmir" Release Notes
 ===================================
 
-v2.5.0rc3
-=========
+v2.5.0
+======
 
 Release Summary
 ---------------
 
-| Release Date: 2018-03-15
-| Estimated Final Release: 2018-03-22
-| `Porting Guide <http://docs.ansible.com/ansible/devel/porting_guides.html>`_
+| Release Date: 2018-03-22
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
 
 
-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)
-
-- Fix onyx_linkagg module writing debugging information to a tempfile on the remote machine (https://github.com/ansible/ansible/pull/37308)
-
-- terraform - fixed typo in module result stdout value (https://github.com/ansible/ansible/pull/37253)
-
-- setup - ensure that `ansible_lo` is properly nested under ansible_facts (https://github.com/ansible/ansible/pull/37360)
-
-
-v2.5.0rc2
-=========
-
 Major Changes
 -------------
 
@@ -41,140 +25,6 @@ Major Changes
   * Loads of bug fixes.
   * Plus lots more.
 
-
-Bugfixes
---------
-
-- tower_* modules - fix credentials to work with v1 and v2 of Ansible Tower API
-
-- docker_container, docker_image, docker_network modules - Update to work with Docker SDK 3.1
-
-- edgeos_facts - fix error when there are no commit revisions (https://github.com/ansible/ansible/issues/37123)
-
-- setup.py - Ensure we install ansible-config and ansible-inventory with `pip install -e` (https://github.com/ansible/ansible/pull/37151)
-
-- Fix bytes/text handling in maven_artifact that was causing tracebacks on Python3
-
-- 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
-
-- (network)_vlan / (network)_vrf - decouple config/state check (https://github.com/ansible/ansible/pull/36704)
-
-- nxos_vlan / nxos_linkagg - fixed various issues (https://github.com/ansible/ansible/pull/36711)
-
-- nios - allow ib_spec attrs to be filtered in update (https://github.com/ansible/ansible/pull/36673)
-
-- nso_config / nso_verify - fixed various issues (https://github.com/ansible/ansible/pull/36583)
-
-- cs_sshkeypair - fixed ssh key rename (https://github.com/ansible/ansible/pull/36726)
-
-- cliconf - fixed get_config traceback (https://github.com/ansible/ansible/pull/36682)
-
-- impi_boot - added floppy option (https://github.com/ansible/ansible/pull/36174)
-
-- nso_config - fixed ordering issues (https://github.com/ansible/ansible/pull/36774)
-
-- nxos_facts - fixed ipv6 parsing issues on new nxos releases (https://github.com/ansible/ansible/pull/36796)
-
-- nso_config - fixed dependency sort cycle issue (https://github.com/ansible/ansible/pull/36828)
-
-- ovirt_* - various fixes (https://github.com/ansible/ansible/pull/36828)
-
-- aws_ssm_parameter_store - added no_log to value arg (https://github.com/ansible/ansible/pull/36828)
-
-- openshift_raw - fixed creation of RoleBinding resources (https://github.com/ansible/ansible/pull/36887)
-
-- nxos_interface - fixed multiple issues (https://github.com/ansible/ansible/pull/36827)
-
-- junos_command - fixed Python3 issues (https://github.com/ansible/ansible/pull/36782)
-
-- ios_static_route - fixed idempotence issue (https://github.com/ansible/ansible/pull/35912)
-
-- win_lineinfile - fixed issue where \r and \n as a string was converted to newline (https://github.com/ansible/ansible/pull/35100)
-
-- win_uri - return response info and content on a non 200 message
-
-- win_wait_for - fixed issue when trying to check a localport when the port is not available externally
-
-
-v2.5.0rc1
-=========
-
-Minor Changes
--------------
-
-- aci_* modules - added signature based authentication
-
-- aci_* modules - included dedicated ACI documentation
-
-- aci_* modules - improved ACI return values
-
-
-Deprecated Features
--------------------
-
-- Apstra's ``aos_*`` modules are deprecated as they do not work with AOS 2.1 or higher. See new modules at `https://github.com/apstra <https://github.com/apstra>`_.
-
-
-Bugfixes
---------
-
-- include_role - improved performance and recursion depth (https://github.com/ansible/ansible/pull/36470)
-
-- lineinfile - fixed regexp used with insert(before|after) inserting duplicate lines (https://github.com/ansible/ansible/pull/36156)
-
-- 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-vault always requesting passwords (https://github.com/ansible/ansible/issues/33027)
-
-- ios CLI - fixed prompt detection (https://github.com/ansible/ansible/issues/35662)
-
-- nxos_user - fixed structured output issue (https://github.com/ansible/ansible/pull/36193)
-
-- nxos_* modules - various fixes (https://github.com/ansible/ansible/pull/36340)
-
-- nxos_* modules - various fixes (https://github.com/ansible/ansible/pull/36374)
-
-- nxos_install_os - kickstart_image_file is no longer required (https://github.com/ansible/ansible/pull/36319)
-
-- script/patch - fixed tempfile ownership issues (https://github.com/ansible/ansible/issues/36398)
-
-- nxos_bgp_neighbor - fixed various module arg issues (https://github.com/ansible/ansible/pull/36318)
-
-- vyos_l3_interface - fixed issues with multiple addresses on an interface (https://github.com/ansible/ansible/pull/36377)
-
-- nxos_banner - fixed issues with unstructured output (https://github.com/ansible/ansible/pull/36411)
-
-- nxos_bgp_neighbor_af - fixed various issues (https://github.com/ansible/ansible/pull/36472)
-
-- vyos_config - fixed IndexError in sanitize_config (https://github.com/ansible/ansible/pull/36375)
-
-- cs_user - fixed user_api_secret return for ACS 4.10+ (https://github.com/ansible/ansible/pull/36447)
-
-- nxos_* modules - various fixes (https://github.com/ansible/ansible/pull/36514)
-
-- fix cases where INVENTORY_UNPARSED_IS_FAILED didn't fail (https://github.com/ansible/ansible/issues/36034)
-
-- aws_ses_identity - fixed failure on missing identity info (https://github.com/ansible/ansible/issues/36065)
-
-- ec2_vpc_net_facts - fixed traceback for regions other than us-east-1 (https://github.com/ansible/ansible/pull/35302)
-
-- aws_waf_* - fixed traceback on WAFStaleDataException (https://github.com/ansible/ansible/pull/36405)
-
-- ec2_group - fixed check_mode when using tags (https://github.com/ansible/ansible/pull/36503)
-
-- loop item labels will now update if templated (https://github.com/ansible/ansible/pull/36430)
-
-- win_feature - will display a more helpful error when it fails during execution (https://github.com/ansible/ansible/pull/36491)
-
-
-v2.5.0b2
-========
-
-Major Changes
--------------
-
 - New simpler and more intuitive 'loop' keyword for task loops. The ``with_<lookup>`` loops will likely be deprecated in the near future and eventually removed.
 
 - Added fact namespacing; from now on facts will be available under ``ansible_facts`` namespace (for example: ``ansible_facts.os_distribution``)
@@ -238,10 +88,18 @@ Minor Changes
   the spelling of the config value. ANSIBLE\_REMOTE\_TEMP will be
   deprecated in the future.
 
+- aci_* modules - added signature based authentication
+
+- aci_* modules - included dedicated ACI documentation
+
+- aci_* modules - improved ACI return values
+
 
 Deprecated Features
 -------------------
 
+- Apstra's ``aos_*`` modules are deprecated as they do not work with AOS 2.1 or higher. See new modules at `https://github.com/apstra <https://github.com/apstra>`_.
+
 - Previously deprecated 'hostfile' config settings have been
   're-deprecated' because previously code did not warn about deprecated
   configuration settings.
@@ -742,26 +600,50 @@ New Modules
 Bugfixes
 --------
 
+- tower_* modules - fix credentials to work with v1 and v2 of Ansible Tower API
+
 - azure_rm modules - updated with internal changes to use API profiles and kwargs for future Azure Stack support and better stability between SDK updates. (https://github.com/ansible/ansible/pull/35538)
 
 - fixed memory bloat on nested includes by preventing blocks from self-parenting (https://github.com/ansible/ansible/pull/36075)
 
 - updated to ensure displayed messages under peristent connections are returned to the controller (https://github.com/ansible/ansible/pull/36064)
 
+- docker_container, docker_image, docker_network modules - Update to work with Docker SDK 3.1
+
+- edgeos_facts - fix error when there are no commit revisions (https://github.com/ansible/ansible/issues/37123)
+
 - eos_vrf and eos_eapi - fixed vrf parsing (https://github.com/ansible/ansible/pull/35791)
 
+- include_role - improved performance and recursion depth (https://github.com/ansible/ansible/pull/36470)
+
 - interface_file - now accepts interfaces without address family or method (https://github.com/ansible/ansible/pull/34200)
 
 - lineinfile - fixed insertion if pattern already exists (https://github.com/ansible/ansible/pull/33393)
 
+- lineinfile - fixed regexp used with insert(before|after) inserting duplicate lines (https://github.com/ansible/ansible/pull/36156)
+
+- 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)
+
 - nxos_evpn_vni - fixed a number of issues (https://github.com/ansible/ansible/pull/35930)
 
 - nxos_igmp_interface - fixed response handling for different nxos versions (https://github.com/ansible/ansible/pull/35959)
 
 - nxos_interface_ospf - added various bugfixes (https://github.com/ansible/ansible/pull/35988)
 
+- Fix onyx_linkagg module writing debugging information to a tempfile on the remote machine (https://github.com/ansible/ansible/pull/37308)
+
 - openshift modules - updated to client version 0.4.0 (https://github.com/ansible/ansible/pull/35127)
 
+- setup.py - Ensure we install ansible-config and ansible-inventory with `pip install -e` (https://github.com/ansible/ansible/pull/37151)
+
+- 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 bytes/text handling in maven_artifact that was causing tracebacks on Python3
+
+- 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
+
 - fixed templating issues in loop_control (https://github.com/ansible/ansible/pull/36124)
 
 - ansible-config - fixed traceback when no config file is present (https://github.com/ansible/ansible/issues/35965)
@@ -772,6 +654,82 @@ Bugfixes
 
 - ios_ping - updated to allow for count > 70 (https://github.com/ansible/ansible/pull/36142)
 
+- fix for ansible-vault always requesting passwords (https://github.com/ansible/ansible/issues/33027)
+
+- ios CLI - fixed prompt detection (https://github.com/ansible/ansible/issues/35662)
+
+- nxos_user - fixed structured output issue (https://github.com/ansible/ansible/pull/36193)
+
+- nxos_* modules - various fixes (https://github.com/ansible/ansible/pull/36340)
+
+- nxos_* modules - various fixes (https://github.com/ansible/ansible/pull/36374)
+
+- nxos_install_os - kickstart_image_file is no longer required (https://github.com/ansible/ansible/pull/36319)
+
+- script/patch - fixed tempfile ownership issues (https://github.com/ansible/ansible/issues/36398)
+
+- nxos_bgp_neighbor - fixed various module arg issues (https://github.com/ansible/ansible/pull/36318)
+
+- vyos_l3_interface - fixed issues with multiple addresses on an interface (https://github.com/ansible/ansible/pull/36377)
+
+- nxos_banner - fixed issues with unstructured output (https://github.com/ansible/ansible/pull/36411)
+
+- nxos_bgp_neighbor_af - fixed various issues (https://github.com/ansible/ansible/pull/36472)
+
+- vyos_config - fixed IndexError in sanitize_config (https://github.com/ansible/ansible/pull/36375)
+
+- cs_user - fixed user_api_secret return for ACS 4.10+ (https://github.com/ansible/ansible/pull/36447)
+
+- nxos_* modules - various fixes (https://github.com/ansible/ansible/pull/36514)
+
+- fix cases where INVENTORY_UNPARSED_IS_FAILED didn't fail (https://github.com/ansible/ansible/issues/36034)
+
+- aws_ses_identity - fixed failure on missing identity info (https://github.com/ansible/ansible/issues/36065)
+
+- ec2_vpc_net_facts - fixed traceback for regions other than us-east-1 (https://github.com/ansible/ansible/pull/35302)
+
+- aws_waf_* - fixed traceback on WAFStaleDataException (https://github.com/ansible/ansible/pull/36405)
+
+- ec2_group - fixed check_mode when using tags (https://github.com/ansible/ansible/pull/36503)
+
+- loop item labels will now update if templated (https://github.com/ansible/ansible/pull/36430)
+
+- (network)_vlan / (network)_vrf - decouple config/state check (https://github.com/ansible/ansible/pull/36704)
+
+- nxos_vlan / nxos_linkagg - fixed various issues (https://github.com/ansible/ansible/pull/36711)
+
+- nios - allow ib_spec attrs to be filtered in update (https://github.com/ansible/ansible/pull/36673)
+
+- nso_config / nso_verify - fixed various issues (https://github.com/ansible/ansible/pull/36583)
+
+- cs_sshkeypair - fixed ssh key rename (https://github.com/ansible/ansible/pull/36726)
+
+- cliconf - fixed get_config traceback (https://github.com/ansible/ansible/pull/36682)
+
+- impi_boot - added floppy option (https://github.com/ansible/ansible/pull/36174)
+
+- nso_config - fixed ordering issues (https://github.com/ansible/ansible/pull/36774)
+
+- nxos_facts - fixed ipv6 parsing issues on new nxos releases (https://github.com/ansible/ansible/pull/36796)
+
+- nso_config - fixed dependency sort cycle issue (https://github.com/ansible/ansible/pull/36828)
+
+- ovirt_* - various fixes (https://github.com/ansible/ansible/pull/36828)
+
+- aws_ssm_parameter_store - added no_log to value arg (https://github.com/ansible/ansible/pull/36828)
+
+- openshift_raw - fixed creation of RoleBinding resources (https://github.com/ansible/ansible/pull/36887)
+
+- nxos_interface - fixed multiple issues (https://github.com/ansible/ansible/pull/36827)
+
+- junos_command - fixed Python3 issues (https://github.com/ansible/ansible/pull/36782)
+
+- ios_static_route - fixed idempotence issue (https://github.com/ansible/ansible/pull/35912)
+
+- terraform - fixed typo in module result stdout value (https://github.com/ansible/ansible/pull/37253)
+
+- setup - ensure that `ansible_lo` is properly nested under ansible_facts (https://github.com/ansible/ansible/pull/37360)
+
 - vmware_guest_snapshot - updated to always check for root snapshot (https://github.com/ansible/ansible/pull/36001)
 
 - vyos - added fixes to check mode support (https://github.com/ansible/ansible/pull/35977)
@@ -780,7 +738,15 @@ Bugfixes
 
 - win_domain_controller - updated to only specify ReadOnlyReplica when necessary (https://github.com/ansible/ansible/pull/36017)
 
+- win_feature - will display a more helpful error when it fails during execution (https://github.com/ansible/ansible/pull/36491)
+
+- win_lineinfile - fixed issue where \r and \n as a string was converted to newline (https://github.com/ansible/ansible/pull/35100)
+
 - win_updates - fixed regression with string category names (https://github.com/ansible/ansible/pull/36015)
 
+- win_uri - return response info and content on a non 200 message
+
 - win_uri - fixed issues with the creates and removes options (https://github.com/ansible/ansible/pull/36016)
 
+- win_wait_for - fixed issue when trying to check a localport when the port is not available externally
+
diff --git a/changelogs/fragments/v2.5.0_summary.yaml b/changelogs/fragments/v2.5.0_summary.yaml
new file mode 100644
index 0000000000..6a990b55fe
--- /dev/null
+++ b/changelogs/fragments/v2.5.0_summary.yaml
@@ -0,0 +1,3 @@
+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.0rc3_summary.yaml b/changelogs/fragments/v2.5.0rc3_summary.yaml
deleted file mode 100644
index a9f6d794b9..0000000000
--- a/changelogs/fragments/v2.5.0rc3_summary.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-release_summary: |
-   | Release Date: 2018-03-15
-   | Estimated Final Release: 2018-03-22
-   | `Porting Guide <http://docs.ansible.com/ansible/devel/porting_guides.html>`_
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index a0dbd36e8e..e19d40e1f2 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.0rc3'
+__version__ = '2.5.0'
 __author__ = 'Ansible, Inc.'
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index e3421f744d..dc673b01ef 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -4,6 +4,145 @@ ansible (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low
 
  -- Ansible, Inc. <info@ansible.com>  %DATE%
 
+
+ansible (2.5.0-1) unstable; urgency=low
+
+  * 2.5.0-1
+
+ -- Ansible, Inc. <info@ansible.com>  Thu, 22 Mar 2018 17:20:50 -0700
+
+
+ansible (2.4.3.0) unstable; urgency=low
+
+  * 2.4.3.0
+
+ -- Ansible, Inc. <info@ansible.com>  Wed, 31 Jan 2018 13:28:06 -0800
+
+
+ansible (2.4.2.0) unstable; urgency=low
+
+  * 2.4.2.0
+
+ -- Ansible, Inc. <info@ansible.com>  Wed, 29 Nov 2017 12:18:55 -0800
+
+
+ansible (2.4.1.0) unstable; urgency=low
+
+  * 2.4.1.0
+
+ -- Ansible, Inc. <info@ansible.com>  Wed, 25 Oct 2017 13:33:17 -0700
+
+
+ansible (2.4.0.0) unstable; urgency=low
+
+  * 2.4.0.0
+
+ -- Ansible, Inc. <info@ansible.com>  Mon, 18 Sep 2017 18:22:15 -0700
+
+
+ansible (2.3.3.0) unstable; urgency=low
+
+  * 2.3.3.0
+
+ -- Ansible, Inc. <info@ansible.com>  Wed, 20 Dec 2017 11:49:40 -0600
+
+
+ansible (2.3.2.0) unstable; urgency=low
+
+  * 2.3.2.0
+
+ -- Ansible, Inc. <info@ansible.com>  Fri, 04 Aug 2017 15:24:07 -0500
+
+
+ansible (2.3.1.0) unstable; urgency=low
+
+  * 2.3.1.0
+
+ -- Ansible, Inc. <info@ansible.com>  Thu, 01 Jun 2017 10:57:36 -0500
+
+
+ansible (2.3.0.0) unstable; urgency=low
+
+  * 2.3.0.0
+
+ -- Ansible, Inc. <info@ansible.com>  Wed, 12 Apr 2017 08:56:32 -0500
+
+ansible (2.2.3.0) unstable; urgency=low
+
+  * 2.2.3.0
+
+ -- Ansible, Inc. <info@ansible.com>  Tue, 09 May 2017 09:50:18 -0500
+
+
+ansible (2.2.2.0) unstable; urgency=low
+
+  * 2.2.2.0
+
+ -- Ansible, Inc. <info@ansible.com>  Mon, 27 Mar 2017 14:04:32 -0500
+
+
+ansible (2.2.1.0) unstable; urgency=low
+
+  * 2.2.1.0
+
+ -- Ansible, Inc. <info@ansible.com>  Mon, 16 Jan 2017 10:13:29 -0600
+
+
+ansible (2.2.0.0) unstable; urgency=low
+
+  * 2.2.0.0
+
+ -- Ansible, Inc. <info@ansible.com>  Mon, 31 Oct 2016 22:20:37 -0500
+
+ansible (2.1.6.0) unstable; urgency=low
+
+  * 2.1.6.0
+
+ -- Ansible, Inc. <info@ansible.com>  Thu, 01 Jun 2017 13:24:21 -0500
+
+
+ansible (2.1.5.0) unstable; urgency=low
+
+  * 2.1.5.0
+
+ -- Ansible, Inc. <info@ansible.com>  Mon, 27 Mar 2017 13:46:02 -0500
+
+
+ansible (2.1.4.0) unstable; urgency=low
+
+  * 2.1.4.0
+
+ -- Ansible, Inc. <info@ansible.com>  Mon, 16 Jan 2017 10:19:57 -0600
+
+
+ansible (2.1.3.0) unstable; urgency=low
+
+  * 2.1.3.0
+
+ -- Ansible, Inc. <info@ansible.com>  Fri, 04 Nov 2016 11:51:43 -0500
+
+
+ansible (2.1.2.0) unstable; urgency=low
+
+  * 2.1.2.0
+
+ -- Ansible, Inc. <support@ansible.com>  Thu, 29 Sep 2016 10:01:34 -0500
+
+
+ansible (2.1.1.0) unstable; urgency=low
+
+  * 2.1.1.0
+
+ -- Ansible, Inc. <support@ansible.com>  Thu, 28 Jul 2016 10:32:32 -0700
+
+
+ansible (2.0.2.0) unstable; urgency=low
+
+  * 2.0.2.0
+
+ -- Ansible, Inc. <support@ansible.com>  Tue, 19 Apr 2016 17:24:22 -0400
+
+
 ansible (2.0.1.0) unstable; urgency=low
 
   * 2.0.1.0
diff --git a/packaging/release/vars/versions.yml b/packaging/release/vars/versions.yml
index ef4b941f12..ef500bdd6f 100644
--- a/packaging/release/vars/versions.yml
+++ b/packaging/release/vars/versions.yml
@@ -2,7 +2,7 @@ versions:
 - "2.5":
     code_name: "Kashmir"
     releases:
-    - "0": TBD
+    - "0": "03-22-2018"
 - "2.4":
     code_name: "Dancing Days"
     releases:
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 75ac67dbb7..cdff87482c 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -135,6 +135,66 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Thu Mar 22 2018 Ansible, Inc. <info@ansible.com> - 2.5.0-1
+- Release 2.5.0-1
+
+* Wed Jan 31 2018 Ansible, Inc. <info@ansible.com> - 2.4.3.0-1
+- Release 2.4.3.0-1
+
+* Wed Nov 29 2017 Ansible, Inc. <info@ansible.com> - 2.4.2.0-1
+- Release 2.4.2.0-1
+
+* Wed Oct 25 2017 Ansible, Inc. <info@ansible.com> - 2.4.1.0-1
+- Release 2.4.1.0-1
+
+* Mon Sep 18 2017 Ansible, Inc. <info@ansible.com> - 2.4.0.0-1
+- Release 2.4.0.0-1
+
+* Wed Dec 20 2017 Ansible, Inc. <info@ansible.com> - 2.3.3.0-1
+- Release 2.3.3.0-1
+
+* Fri Aug 04 2017 Ansible, Inc. <info@ansible.com> - 2.3.2.0-1
+- Release 2.3.2.0-1
+
+* Thu Jun 01 2017 Ansible, Inc. <info@ansible.com> - 2.3.1.0-1
+- Release 2.3.1.0-1
+
+* Wed Apr 12 2017 Ansible, Inc. <info@ansible.com> - 2.3.0.0-1
+- Release 2.3.0.0-1
+
+* Tue May 09 2017 Ansible, Inc. <info@ansible.com> - 2.2.3.0-1
+- Release 2.2.3.0-1
+
+* Mon Mar 27 2017 Ansible, Inc. <info@ansible.com> - 2.2.2.0-1
+- Release 2.2.2.0-1
+
+* Mon Jan 16 2017 Ansible, Inc. <info@ansible.com> - 2.2.1.0-1
+- Release 2.2.1.0-1
+
+* Mon Oct 31 2016 Ansible, Inc. <info@ansible.com> - 2.2.0.0-1
+- Release 2.2.0.0-1
+
+* Thu Jun 01 2017 Ansible, Inc. <info@ansible.com> - 2.1.6.0-1
+- Release 2.1.6.0-1
+
+* Mon Mar 27 2017 Ansible, Inc. <info@ansible.com> - 2.1.5.0-1
+- Release 2.1.5.0-1
+
+* Mon Jan 16 2017 Ansible, Inc. <info@ansible.com> - 2.1.4.0-1
+- Release 2.1.4.0-1
+
+* Fri Nov 04 2016 Ansible, Inc. <info@ansible.com> - 2.1.3.0-1
+- Release 2.1.3.0-1
+
+* Thu Sep 29 2016 Ansible, Inc. <info@ansible.com> - 2.1.2.0-1
+- Release 2.1.2.0-1
+
+* Thu Jul 28 2016 Ansible, Inc. <info@ansible.com> - 2.1.1.0-1
+- Release 2.1.1.0-1
+
+* Tue Apr 19 2016 Ansible, Inc. <support@ansible.com> - 2.0.2.0-1
+- Release 2.0.2.0-1
+
 * Wed Feb 24 2016 Ansible, Inc. <info@ansible.com> - 2.0.1.0-1
 - Release 2.0.1.0-1