diff --git a/changelogs/CHANGELOG.rst b/CHANGELOG.rst similarity index 95% rename from changelogs/CHANGELOG.rst rename to CHANGELOG.rst index d78b76b7..080da24b 100644 --- a/changelogs/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,21 @@ Cisco.Meraki Release Notes .. contents:: Topics +v2.6.2 +====== + +Minor Changes +------------- + +- Add execution-environment.yml in meta as the base to a Meraki ee +- meraki_network - Add Products to net_type list + +Bugfixes +-------- + +- meraki_alert - Updates now properly set default destination webhook +- meraki_syslog - Fix crash due to incorrect dictionary reference + v2.6.1 ====== diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml index 34c9fd1c..85f95309 100644 --- a/changelogs/.plugin-cache.yaml +++ b/changelogs/.plugin-cache.yaml @@ -194,4 +194,4 @@ plugins: shell: {} strategy: {} vars: {} -version: 2.6.1 +version: 2.6.2 diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index ade0dde2..f76b2afe 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -228,3 +228,17 @@ releases: - rf-profile-create-idempotency.yml - sanity_fixes.yaml release_date: '2022-03-28' + 2.6.2: + changes: + bugfixes: + - meraki_alert - Updates now properly set default destination webhook + - meraki_syslog - Fix crash due to incorrect dictionary reference + minor_changes: + - Add execution-environment.yml in meta as the base to a Meraki ee + - meraki_network - Add Products to net_type list + fragments: + - 288-fix-dict.yml + - 310-alert-webhook.yml + - ee.yml + - net_type-list.yml + release_date: '2022-05-16' diff --git a/changelogs/fragments/288-fix-dict.yml b/changelogs/fragments/288-fix-dict.yml deleted file mode 100644 index d6ae3393..00000000 --- a/changelogs/fragments/288-fix-dict.yml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: - - meraki_syslog - Fix crash due to incorrect dictionary reference diff --git a/changelogs/fragments/310-alert-webhook.yml b/changelogs/fragments/310-alert-webhook.yml deleted file mode 100644 index 888a8721..00000000 --- a/changelogs/fragments/310-alert-webhook.yml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: - - meraki_alert - Updates now properly set default destination webhook diff --git a/changelogs/fragments/ee.yml b/changelogs/fragments/ee.yml deleted file mode 100644 index d5d4b6c6..00000000 --- a/changelogs/fragments/ee.yml +++ /dev/null @@ -1,2 +0,0 @@ -minor_changes: - - Add execution-environment.yml in meta as the base to a Meraki ee diff --git a/changelogs/fragments/net_type-list.yml b/changelogs/fragments/net_type-list.yml deleted file mode 100644 index 7c77704d..00000000 --- a/changelogs/fragments/net_type-list.yml +++ /dev/null @@ -1,2 +0,0 @@ -minor_changes: - - meraki_network - Add Products to net_type list diff --git a/galaxy.yml b/galaxy.yml index 0e59feac..72d2a6a9 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -17,7 +17,7 @@ tags: - firewall - switching - cisco -version: 2.6.1 +version: 2.6.2 build_ignore: - '*tar.gz' - '*.DS_Store'