New release v2.6.12v2.6.12

4 files changed, 43 insertions, 1 deletions

diff --git a/changelogs/.changes.yaml b/changelogs/.changes.yaml
index cf2ff87b05..db6ee47a35 100644
--- a/changelogs/.changes.yaml
+++ b/changelogs/.changes.yaml
@@ -365,6 +365,19 @@ releases:
     - nxos_interface_linkagg_idempotence.yaml
     - v2.6.11_summary.yaml
     release_date: '2018-12-13'
+  2.6.12:
+    codename: Heartbreaker
+    fragments:
+    - 49409-lineinfile_must_not_insert_lines_multiples_times_with_insertbefore_insertafter.yml
+    - 50143-win_firewall_rule-invalid-bypass.yml
+    - 50185-win_updates-report-changes-correctly.yml
+    - acl_doc_fix.yml
+    - docker_volume-force-change-detection-revert.yaml
+    - openstack_inventory_fix.yml
+    - v2.6.12_summary.yaml
+    - win_copy-empty-dir.yaml
+    - win_lineinfile-output.yaml
+    release_date: '2019-01-17'
   2.6.2:
     codename: Heartbreaker
     fragments:
diff --git a/changelogs/CHANGELOG-v2.6.rst b/changelogs/CHANGELOG-v2.6.rst
index 65434baeda..cea7d5ffca 100644
--- a/changelogs/CHANGELOG-v2.6.rst
+++ b/changelogs/CHANGELOG-v2.6.rst
@@ -2,6 +2,32 @@
 Ansible 2.6 "Heartbreaker" Release Notes
 ========================================
 
+v2.6.12
+=======
+
+Release Summary
+---------------
+
+| Release Date: 2019-01-17
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+
+Minor Changes
+-------------
+
+- docker_volume - reverted changed behavior of ``force``, which was released in Ansible 2.7.1 to 2.7.5, and Ansible 2.6.8 to 2.6.11. Volumes are now only recreated if the parameters changed **and** ``force`` is set to ``true`` (instead of or). This is the behavior which has been described in the documentation all the time.
+
+Bugfixes
+--------
+
+- This reverts some changes from commit 723daf3. If a line is found in the file, exactly or via regexp matching, it must not be added again. `insertafter`/`insertbefore` options are used only when a line is to be inserted, to specify where it must be added.
+- allow using openstack inventory plugin w/o a cache
+- document old option that was initally missed
+- win_copy - Fix copy of a dir that contains an empty directory - https://github.com/ansible/ansible/issues/50077
+- win_firewall_rule - Remove invalid 'bypass' action
+- win_lineinfile - Fix issue where a malformed json block was returned causing an error
+- win_updates - Correctly report changes on success
+
 v2.6.11
 =======
 
diff --git a/changelogs/fragments/v2.6.12_summary.yaml b/changelogs/fragments/v2.6.12_summary.yaml
new file mode 100644
index 0000000000..ae6dfa1178
--- /dev/null
+++ b/changelogs/fragments/v2.6.12_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2019-01-17
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 0dfb7684bc..e8d120a615 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.11.post0'
+__version__ = '2.6.12'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'Heartbreaker'