Merge branch 'main' into some_init

CHANGELOG.rst

@@ -4,6 +4,15 @@ Ansible Utils Collection Release Notes
 
 .. contents:: Topics
 
+
+v2.6.0
+======
+
+Minor Changes
+-------------
+
+- 'consolidate' filter plugin added.
+
 v2.5.2
 ======
 
@@ -59,7 +68,7 @@ v2.4.3
 Release Summary
 ---------------
 
-- Rereleased 2.4.2 with fix of network ee tests.
+Rereleased 2.4.2 with fix of network ee tests.
 
 v2.4.2
 ======
@@ -67,7 +76,7 @@ v2.4.2
 Release Summary
 ---------------
 
-- Rereleased 2.4.1 with valid requirement.txt.
+Rereleased 2.4.1 with valid requirement.txt.
 
 v2.4.1
 ======
@@ -75,7 +84,7 @@ v2.4.1
 Release Summary
 ---------------
 
-- Rereleased 2.4.0 with trivial changes.
+Rereleased 2.4.0 with trivial changes.
 
 v2.4.0
 ======

changelogs/changelog.yaml

@@ -155,16 +155,14 @@ releases:
     release_date: '2021-08-28'
   2.4.1:
     changes:
-      release_summary:
-      - Rereleased 2.4.0 with trivial changes.
+      release_summary: Rereleased 2.4.0 with trivial changes.
     fragments:
     - 2.4.1.yaml
     - fix_network_ee.yaml
     release_date: '2021-09-24'
   2.4.2:
     changes:
-      release_summary:
-      - Rereleased 2.4.1 with valid requirement.txt.
+      release_summary: Rereleased 2.4.1 with valid requirement.txt.
     fragments:
     - 2.4.2.yaml
     - add_ignore_2.13.yaml
@@ -172,11 +170,10 @@ releases:
     release_date: '2021-10-07'
   2.4.3:
     changes:
-      release_summary:
-        - Rereleased 2.4.2 with fix of network ee tests.
+      release_summary: Rereleased 2.4.2 with fix of network ee tests.
     fragments:
-      - 2.4.3.yaml
-      - fix_network_ee.yaml
+    - 2.4.3.yaml
+    - fix_network_ee.yaml
     release_date: '2021-12-07'
   2.5.0:
     changes:
@@ -241,3 +238,14 @@ releases:
     fragments:
     - bugfix_ipaddr_filter.yaml
     release_date: '2022-03-04'
+  2.6.0:
+    changes:
+      minor_changes:
+      - '''consolidate'' filter plugin added.'
+    fragments:
+    - 0-ignore.yml
+    - consolidate_filter_plugin.yml
+    - enable_upgrade_black.yml
+    - pre-commit-enable.yml
+    - pre-commit-skip.yml
+    release_date: '2022-04-12'

changelogs/fragments/0-ignore.yml

@@ -1,3 +0,0 @@
----
-trivial:
-  - Copy ignore.txt.

changelogs/fragments/consolidate_filter_plugin.yml

@@ -1,3 +0,0 @@
----
-minor_changes:
-  - "'consolidate' filter plugin added."

changelogs/fragments/enable_upgrade_black.yml

@@ -1,4 +0,0 @@
----
-trivial:
-  - Enable black via pre-commit.ci
-  - Update black version to latest

changelogs/fragments/pre-commit-enable.yml

@@ -1,4 +0,0 @@
----
-trivial:
-  - Enable pre-commit.ci end-of-file-fixer
-  - Enable pre-commit-ci trailing-whitespace

changelogs/fragments/pre-commit-skip.yml

@@ -1,6 +0,0 @@
----
-trivial:
-  - Exempt update-docs from pre-commit.ci
-  - Disable black temporarily until it can be upgraded
-  - Disable end-of-file-fixer
-  - Disable trailing-whitespace