From 69172f2c1eca73f579f16b350f6acec327437d8c Mon Sep 17 00:00:00 2001
From: Kevin Breit <kevin.breit@kevinbreit.net>
Date: Tue, 14 Jun 2022 20:33:06 -0500
Subject: [PATCH] Prepare for 2.7.0 release

---
 CHANGELOG.rst                                     | 14 ++++++++++++++
 changelogs/.plugin-cache.yaml                     | 12 +++++++++++-
 changelogs/changelog.yaml                         | 15 +++++++++++++++
 .../fragments/meraki_mx_network_vlan_settings.yml |  3 ---
 changelogs/fragments/mx_static_route.yaml         |  3 ---
 changelogs/fragments/s2s_peers.yaml               |  3 ---
 galaxy.yml                                        |  2 +-
 7 files changed, 41 insertions(+), 11 deletions(-)
 delete mode 100644 changelogs/fragments/meraki_mx_network_vlan_settings.yml
 delete mode 100644 changelogs/fragments/mx_static_route.yaml
 delete mode 100644 changelogs/fragments/s2s_peers.yaml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 080da24b..ac0a8b99 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,20 @@ Cisco.Meraki Release Notes
 .. contents:: Topics
 
 
+v2.7.0
+======
+
+Minor Changes
+-------------
+
+- meraki_mx_network_vlan_settings - New module to enable or disable VLANs on a network
+- meraki_mx_third_party_vpn_peers - New module for managing third party VPM peers
+
+Bugfixes
+--------
+
+- meraki_mx_static_route - Add support for gateway_vlan_id otherwise requests could error
+
 v2.6.2
 ======
 
diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
index 85f95309..9b9022f8 100644
--- a/changelogs/.plugin-cache.yaml
+++ b/changelogs/.plugin-cache.yaml
@@ -140,6 +140,11 @@ plugins:
       name: meraki_mx_nat
       namespace: ''
       version_added: null
+    meraki_mx_network_vlan_settings:
+      description: Manage VLAN settings for Meraki Networks
+      name: meraki_mx_network_vlan_settings
+      namespace: ''
+      version_added: null
     meraki_mx_site_to_site_firewall:
       description: Manage MX appliance firewall rules for site-to-site VPNs
       name: meraki_mx_site_to_site_firewall
@@ -155,6 +160,11 @@ plugins:
       name: meraki_mx_static_route
       namespace: ''
       version_added: null
+    meraki_mx_third_party_vpn_peers:
+      description: Manage third party (IPSec) VPN peers for MX devices
+      name: meraki_mx_third_party_vpn_peers
+      namespace: ''
+      version_added: null
     meraki_mx_uplink_bandwidth:
       description: Manage uplinks on Meraki MX appliances
       name: meraki_mx_uplink_bandwidth
@@ -194,4 +204,4 @@ plugins:
   shell: {}
   strategy: {}
   vars: {}
-version: 2.6.2
+version: 2.7.0
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index f76b2afe..a52cb71a 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -242,3 +242,18 @@ releases:
     - ee.yml
     - net_type-list.yml
     release_date: '2022-05-16'
+  2.7.0:
+    changes:
+      bugfixes:
+      - meraki_mx_static_route - Add support for gateway_vlan_id otherwise requests
+        could error
+      minor_changes:
+      - meraki_mx_network_vlan_settings - New module to enable or disable VLANs on
+        a network
+      - meraki_mx_third_party_vpn_peers - New module for managing third party VPM
+        peers
+    fragments:
+    - meraki_mx_network_vlan_settings.yml
+    - mx_static_route.yaml
+    - s2s_peers.yaml
+    release_date: '2022-06-14'
diff --git a/changelogs/fragments/meraki_mx_network_vlan_settings.yml b/changelogs/fragments/meraki_mx_network_vlan_settings.yml
deleted file mode 100644
index 92fd2762..00000000
--- a/changelogs/fragments/meraki_mx_network_vlan_settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-minor_changes:
-  - meraki_mx_network_vlan_settings - New module to enable or disable VLANs on a network
diff --git a/changelogs/fragments/mx_static_route.yaml b/changelogs/fragments/mx_static_route.yaml
deleted file mode 100644
index 99718a68..00000000
--- a/changelogs/fragments/mx_static_route.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-bugfixes:
-- meraki_mx_static_route - Add support for gateway_vlan_id otherwise requests could error
\ No newline at end of file
diff --git a/changelogs/fragments/s2s_peers.yaml b/changelogs/fragments/s2s_peers.yaml
deleted file mode 100644
index cb91d316..00000000
--- a/changelogs/fragments/s2s_peers.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-minor_changes:
-- meraki_mx_third_party_vpn_peers - New module for managing third party VPM peers
\ No newline at end of file
diff --git a/galaxy.yml b/galaxy.yml
index 397904c0..157f4a23 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -17,7 +17,7 @@ tags:
 - firewall
 - switching
 - cisco
-version: 2.6.2
+version: 2.7.0
 build_ignore:
 - '*tar.gz'
 - '*.DS_Store'