From e575a181125a226fb45acfaed1b942e2e5c8f9a8 Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aklychko@redhat.com>
Date: Fri, 23 Apr 2021 14:42:54 +0200
Subject: [PATCH] Release 2.1.0 commit

---
 changelogs/CHANGELOG.rst                      | 28 +++++++++++++++++
 changelogs/changelog.yaml                     | 30 +++++++++++++++++++
 ...7-mysql_replication_deprecate_ret_vals.yml |  5 ----
 .../150-mysql_replication_master_related.yml  |  6 ----
 .../153-mysql_revert_connector_changes.yml    |  2 --
 5 files changed, 58 insertions(+), 13 deletions(-)
 delete mode 100644 changelogs/fragments/147-mysql_replication_deprecate_ret_vals.yml
 delete mode 100644 changelogs/fragments/150-mysql_replication_master_related.yml
 delete mode 100644 changelogs/fragments/153-mysql_revert_connector_changes.yml

diff --git a/changelogs/CHANGELOG.rst b/changelogs/CHANGELOG.rst
index c186696..8c6c034 100644
--- a/changelogs/CHANGELOG.rst
+++ b/changelogs/CHANGELOG.rst
@@ -5,6 +5,34 @@ Community MySQL Collection Release Notes
 .. contents:: Topics
 
 
+v2.1.0
+======
+
+Release Summary
+---------------
+
+This is the minor release of the ``community.mysql`` collection.
+This changelog contains all changes to the modules in this collection
+that have been added after the release of ``community.mysql`` 2.0.0.
+
+Major Changes
+-------------
+
+- mysql_replication - add deprecation warning that the ``Is_Slave`` and ``Is_Master`` return values will be replaced with ``Is_Primary`` and ``Is_Replica`` in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/pull/147).
+- mysql_replication - the choices of the ``state`` option containing ``master`` will be finally replaced with the alternative ``primary`` choices in ``community.mysql`` 3.0.0, add deprecation warnings (https://github.com/ansible-collections/community.mysql/pull/150).
+
+Minor Changes
+-------------
+
+- mysql_replication - add alternative (``primary``) choices to the ``state`` option choices containing ``master`` (https://github.com/ansible-collections/community.mysql/pull/150).
+- mysql_replication - add the ``Is_Primary`` and ``Is_Replica`` alternatives to the ``Is_Slave`` and ``Is_Master`` return values as a preparation for replacement in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/pull/147).
+- mysql_replication - change ``master_`` options to ``primary_`` options, add aliases to keep compatibility (https://github.com/ansible-collections/community.mysql/pull/150).
+
+Bugfixes
+--------
+
+- mysql - revert changes of connector arguments made in pull request 116 causing the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).
+
 v2.0.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index fe92a0f..337f532 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -268,3 +268,33 @@ releases:
     - 144-mysql_replication_remove_slave_from_messages.yml
     - 2.0.0.yml
     release_date: '2021-04-15'
+  2.1.0:
+    changes:
+      bugfixes:
+      - mysql - revert changes of connector arguments made in pull request 116 causing
+        the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).
+      major_changes:
+      - mysql_replication - add deprecation warning that the ``Is_Slave`` and ``Is_Master``
+        return values will be replaced with ``Is_Primary`` and ``Is_Replica`` in ``community.mysql``
+        3.0.0 (https://github.com/ansible-collections/community.mysql/pull/147).
+      - mysql_replication - the choices of the ``state`` option containing ``master``
+        will be finally replaced with the alternative ``primary`` choices in ``community.mysql``
+        3.0.0, add deprecation warnings (https://github.com/ansible-collections/community.mysql/pull/150).
+      minor_changes:
+      - mysql_replication - add alternative (``primary``) choices to the ``state``
+        option choices containing ``master`` (https://github.com/ansible-collections/community.mysql/pull/150).
+      - mysql_replication - add the ``Is_Primary`` and ``Is_Replica`` alternatives
+        to the ``Is_Slave`` and ``Is_Master`` return values as a preparation for replacement
+        in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/pull/147).
+      - mysql_replication - change ``master_`` options to ``primary_`` options, add
+        aliases to keep compatibility (https://github.com/ansible-collections/community.mysql/pull/150).
+      release_summary: 'This is the minor release of the ``community.mysql`` collection.
+
+        This changelog contains all changes to the modules in this collection
+
+        that have been added after the release of ``community.mysql`` 2.0.0.'
+    fragments:
+    - 147-mysql_replication_deprecate_ret_vals.yml
+    - 150-mysql_replication_master_related.yml
+    - 153-mysql_revert_connector_changes.yml
+    release_date: '2021-04-23'
diff --git a/changelogs/fragments/147-mysql_replication_deprecate_ret_vals.yml b/changelogs/fragments/147-mysql_replication_deprecate_ret_vals.yml
deleted file mode 100644
index 9261453..0000000
--- a/changelogs/fragments/147-mysql_replication_deprecate_ret_vals.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-major_changes:
-- mysql_replication - add deprecation warning that the ``Is_Slave`` and ``Is_Master`` return values will be replaced with ``Is_Primary`` and ``Is_Replica`` in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/pull/147).
-
-minor_changes:
-- mysql_replication - add the ``Is_Primary`` and ``Is_Replica`` alternatives to the ``Is_Slave`` and ``Is_Master`` return values as a preparation for replacement in ``community.mysql`` 3.0.0 (https://github.com/ansible-collections/community.mysql/pull/147).
diff --git a/changelogs/fragments/150-mysql_replication_master_related.yml b/changelogs/fragments/150-mysql_replication_master_related.yml
deleted file mode 100644
index 83b3538..0000000
--- a/changelogs/fragments/150-mysql_replication_master_related.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-minor_changes:
-- mysql_replication - change ``master_`` options to ``primary_`` options, add aliases to keep compatibility (https://github.com/ansible-collections/community.mysql/pull/150).
-- mysql_replication - add alternative (``primary``) choices to the ``state`` option choices containing ``master`` (https://github.com/ansible-collections/community.mysql/pull/150).
-
-major_changes:
-- mysql_replication - the choices of the ``state`` option containing ``master`` will be finally replaced with the alternative ``primary`` choices in ``community.mysql`` 3.0.0, add deprecation warnings (https://github.com/ansible-collections/community.mysql/pull/150).
diff --git a/changelogs/fragments/153-mysql_revert_connector_changes.yml b/changelogs/fragments/153-mysql_revert_connector_changes.yml
deleted file mode 100644
index 48c8b36..0000000
--- a/changelogs/fragments/153-mysql_revert_connector_changes.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-- mysql - revert changes of connector arguments made in pull request 116 causing the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).