From 796a6ca7c549cdd42e2d83cc7c668e89fe4e1f51 Mon Sep 17 00:00:00 2001
From: Rohit Thakur <rohitthakur2590@outlook.com>
Date: Wed, 6 Mar 2024 21:28:12 +0530
Subject: [PATCH] Prepare release 6.0.2 (#501)

* Prepare release 6.0.2

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 CHANGELOG.rst                                 | 32 +++++++++++++++++++
 changelogs/changelog.yaml                     | 31 ++++++++++++++++++
 changelogs/fragments/empty_facts.yaml         | 20 ------------
 .../fragments/update_junos_config_docs.yaml   |  5 ---
 galaxy.yml                                    |  2 +-
 5 files changed, 64 insertions(+), 26 deletions(-)
 delete mode 100644 changelogs/fragments/empty_facts.yaml
 delete mode 100644 changelogs/fragments/update_junos_config_docs.yaml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9b478875..4cba3509 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,38 @@ Junipernetworks Junos Collection Release Notes
 .. contents:: Topics
 
 
+v6.0.2
+======
+
+Bugfixes
+--------
+
+- acls
+- initialize facts dictionary with empty containers for respective resources mentioned below
+- lldp_global
+- lldp_interfaces
+- logging_global
+- ntp_global
+- ospf_interfaces
+- ospfv2
+- ospfv3
+- prefix_lists
+- routing_instances
+- routing_options
+- security_policies
+- security_policies_global
+- security_zones
+- snmp_server
+- static_routes
+- vlans
+
+Documentation Changes
+---------------------
+
+- Remove the part of the description which incorrectly describes the behavior and type of confirm attribute.
+- Update example performing `confirm_commit`.
+- Update with more examples using the `confirm` option to set a timer.
+
 v6.0.1
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index e81208a3..33822623 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -597,3 +597,34 @@ releases:
       - module_defaults.yaml
       - trivial_lint.yaml
     release_date: "2024-01-31"
+  6.0.2:
+    changes:
+      bugfixes:
+        - acls
+        - initialize facts dictionary with empty containers for respective resources
+          mentioned below
+        - lldp_global
+        - lldp_interfaces
+        - logging_global
+        - ntp_global
+        - ospf_interfaces
+        - ospfv2
+        - ospfv3
+        - prefix_lists
+        - routing_instances
+        - routing_options
+        - security_policies
+        - security_policies_global
+        - security_zones
+        - snmp_server
+        - static_routes
+        - vlans
+      doc_changes:
+        - Remove the part of the description which incorrectly describes the behavior
+          and type of confirm attribute.
+        - Update example performing `confirm_commit`.
+        - Update with more examples using the `confirm` option to set a timer.
+    fragments:
+      - empty_facts.yaml
+      - update_junos_config_docs.yaml
+    release_date: "2024-03-06"
diff --git a/changelogs/fragments/empty_facts.yaml b/changelogs/fragments/empty_facts.yaml
deleted file mode 100644
index f5c6aef3..00000000
--- a/changelogs/fragments/empty_facts.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-bugfixes:
-  - initialize facts dictionary with empty containers for respective resources mentioned below
-  - acls
-  - lldp_global
-  - lldp_interfaces
-  - logging_global
-  - ntp_global
-  - ospf_interfaces
-  - ospfv2
-  - ospfv3
-  - prefix_lists
-  - routing_instances
-  - routing_options
-  - security_policies
-  - security_policies_global
-  - security_zones
-  - snmp_server
-  - static_routes
-  - vlans
diff --git a/changelogs/fragments/update_junos_config_docs.yaml b/changelogs/fragments/update_junos_config_docs.yaml
deleted file mode 100644
index df4ef4cb..00000000
--- a/changelogs/fragments/update_junos_config_docs.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-doc_changes:
-  - Remove the part of the description which incorrectly describes the behavior and type of confirm attribute.
-  - Update with more examples using the `confirm` option to set a timer.
-  - Update example performing `confirm_commit`.
diff --git a/galaxy.yml b/galaxy.yml
index 95bcc525..a50dd9da 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -11,4 +11,4 @@ readme: README.md
 repository: https://github.com/ansible-collections/junipernetworks.junos
 issues: https://github.com/ansible-collections/junipernetworks.junos/issues
 tags: [juniper, junipernetworks, junos, networking, security, netconf]
-version: 6.0.1
+version: 6.0.2