summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2019-07-03 09:43:54 -0700
committerToshio Kuratomi <a.badger@gmail.com>2019-07-03 09:43:54 -0700
commita5f3791a914e5e288a519aa9f57657ebb9080fdb (patch)
treedccba8d7a321dc8c286b637af128910b5e2fe586
parentf3ce22b1686c16cbb99212027f1885b83a1cedfe (diff)
downloadansible-a5f3791a914e5e288a519aa9f57657ebb9080fdb.tar.gz
New release v2.6.18v2.6.18
-rw-r--r--changelogs/.changes.yaml6
-rw-r--r--changelogs/CHANGELOG-v2.6.rst15
-rw-r--r--changelogs/fragments/v2.6.18_summary.yaml3
-rw-r--r--lib/ansible/release.py2
4 files changed, 25 insertions, 1 deletions
diff --git a/changelogs/.changes.yaml b/changelogs/.changes.yaml
index 92234283ab..ec5de7907c 100644
--- a/changelogs/.changes.yaml
+++ b/changelogs/.changes.yaml
@@ -443,6 +443,12 @@ releases:
- win_acl-network.yaml
- win_domain-setup.yaml
release_date: '2019-05-23'
+ 2.6.18:
+ codename: Heartbreaker
+ fragments:
+ - fix_safe_eval.yml
+ - v2.6.18_summary.yaml
+ release_date: '2019-07-03'
2.6.2:
codename: Heartbreaker
fragments:
diff --git a/changelogs/CHANGELOG-v2.6.rst b/changelogs/CHANGELOG-v2.6.rst
index 011c42486b..1f0115a54c 100644
--- a/changelogs/CHANGELOG-v2.6.rst
+++ b/changelogs/CHANGELOG-v2.6.rst
@@ -2,6 +2,21 @@
Ansible 2.6 "Heartbreaker" Release Notes
========================================
+v2.6.18
+=======
+
+Release Summary
+---------------
+
+| Release Date: 2019-07-03
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+
+Bugfixes
+--------
+
+- Handle improper variable substitution that was happening in safe_eval, it was always meant to just do 'type enforcement' and have Jinja2 deal with all variable interpolation. Also see CVE-2019-10156
+
v2.6.17
=======
diff --git a/changelogs/fragments/v2.6.18_summary.yaml b/changelogs/fragments/v2.6.18_summary.yaml
new file mode 100644
index 0000000000..605227d7ae
--- /dev/null
+++ b/changelogs/fragments/v2.6.18_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+ | Release Date: 2019-07-03
+ | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index bb2105b018..93ee7dcd3b 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.6.17.post0'
+__version__ = '2.6.18'
__author__ = 'Ansible, Inc.'
__codename__ = 'Heartbreaker'