From b378a44ab3524f19a8e11d98eb327b37255d0bd2 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Mon, 11 May 2020 16:33:55 -0700
Subject: [PATCH] New release v2.7.18

---
 changelogs/.changes.yaml                  |  7 +++++++
 changelogs/CHANGELOG-v2.7.rst             | 22 +++++++++++++++++++++-
 changelogs/fragments/v2.7.18_summary.yaml |  3 +++
 lib/ansible/release.py                    |  2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/fragments/v2.7.18_summary.yaml

diff --git a/changelogs/.changes.yaml b/changelogs/.changes.yaml
index 5f45fb18de5..1e54ab82b65 100644
--- a/changelogs/.changes.yaml
+++ b/changelogs/.changes.yaml
@@ -699,6 +699,13 @@ releases:
     - vault_tmp_race_fix.yml
     - win-unzip-check-extraction-path.yml
     release_date: '2020-04-16'
+  2.7.18:
+    codename: In the Light
+    fragments:
+    - 68592-pip-check_mode-prereleases.yml
+    - inventory_docs_fix.yml
+    - v2.7.18_summary.yaml
+    release_date: '2020-05-11'
   2.7.2:
     codename: In the Light
     fragments:
diff --git a/changelogs/CHANGELOG-v2.7.rst b/changelogs/CHANGELOG-v2.7.rst
index 74288f99499..06ca565c391 100644
--- a/changelogs/CHANGELOG-v2.7.rst
+++ b/changelogs/CHANGELOG-v2.7.rst
@@ -5,6 +5,26 @@ Ansible 2.7 "In the Light" Release Notes
 .. contents:: Topics
 
 
+v2.7.18
+=======
+
+Release Summary
+---------------
+
+| Release Date: 2020-05-11
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+
+Minor Changes
+-------------
+
+- Point inventory script location to their respective version rather than devel version in documentation.
+
+Bugfixes
+--------
+
+- pip - check_mode with ``state: present`` now returns the correct state for pre-release versioned packages
+
 v2.7.17
 =======
 
@@ -37,7 +57,7 @@ Bugfixes
 - Ensure DataLoader temp files are removed at appropriate times and that we observe the LOCAL_TMP setting.
 - Ensure we don't allow ansible_facts subkey of ansible_facts to override top level, also fix 'deprefixing' to prevent key transforms.
 - Ensure we get an error when creating a remote tmp if it already exists. CVE-2020-1733
-- In fetch action, avoid using slurp return to set up dest, also ensure no dir traversal CVE-2019-3828.
+- In fetch action, avoid using slurp return to set up dest, also ensure no dir traversal CVE-2020-1735.
 - ansible-test - Use ``virtualenv`` versions before 20 on provisioned macOS instances to remain compatible with an older pip install.
 - ansible-test now limits Jinja2 installs to version 2.10 and earlier on Python 2.6
 
diff --git a/changelogs/fragments/v2.7.18_summary.yaml b/changelogs/fragments/v2.7.18_summary.yaml
new file mode 100644
index 00000000000..fd6bf5738d1
--- /dev/null
+++ b/changelogs/fragments/v2.7.18_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2020-05-11
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 16450ab7de6..805d9db3701 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.7.17.post0'
+__version__ = '2.7.18'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'In the Light'