Adding upstream version 2.10.7+merged+base+2.10.8+dfsg.upstream/2.10.7+merged+base+2.10.8+dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 468 insertions, 0 deletions

diff --git a/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/.plugin-cache.yaml b/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/.plugin-cache.yaml
new file mode 100644
index 00000000..dd6fad55
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/.plugin-cache.yaml
@@ -0,0 +1,185 @@
+plugins:
+  become: {}
+  cache: {}
+  callback: {}
+  cliconf: {}
+  connection: {}
+  httpapi: {}
+  inventory: {}
+  lookup: {}
+  module:
+    meraki_admin:
+      description: Manage administrators in the Meraki cloud
+      name: meraki_admin
+      namespace: ''
+      version_added: 1.0.0
+    meraki_alert:
+      description: Manage alerts in the Meraki cloud
+      name: meraki_alert
+      namespace: ''
+      version_added: 2.1.0
+    meraki_config_template:
+      description: Manage configuration templates in the Meraki cloud
+      name: meraki_config_template
+      namespace: ''
+      version_added: 1.0.0
+    meraki_device:
+      description: Manage devices in the Meraki cloud
+      name: meraki_device
+      namespace: ''
+      version_added: null
+    meraki_firewalled_services:
+      description: Edit firewall policies for administrative network services
+      name: meraki_firewalled_services
+      namespace: ''
+      version_added: null
+    meraki_management_interface:
+      description: Configure Meraki management interfaces
+      name: meraki_management_interface
+      namespace: ''
+      version_added: 1.1.0
+    meraki_mr_l3_firewall:
+      description: Manage MR access point layer 3 firewalls in the Meraki cloud
+      name: meraki_mr_l3_firewall
+      namespace: ''
+      version_added: null
+    meraki_mr_rf_profile:
+      description: Manage RF profiles for Meraki wireless networks
+      name: meraki_mr_rf_profile
+      namespace: ''
+      version_added: null
+    meraki_mr_settings:
+      description: Manage general settings for Meraki wireless networks
+      name: meraki_mr_settings
+      namespace: ''
+      version_added: null
+    meraki_mr_ssid:
+      description: Manage wireless SSIDs in the Meraki cloud
+      name: meraki_mr_ssid
+      namespace: ''
+      version_added: null
+    meraki_ms_access_list:
+      description: Manage access lists for Meraki switches in the Meraki cloud
+      name: meraki_ms_access_list
+      namespace: ''
+      version_added: 0.1.0
+    meraki_ms_l3_interface:
+      description: Manage routed interfaces on MS switches
+      name: meraki_ms_l3_interface
+      namespace: ''
+      version_added: null
+    meraki_ms_link_aggregation:
+      description: Manage link aggregations on MS switches
+      name: meraki_ms_link_aggregation
+      namespace: ''
+      version_added: 1.2.0
+    meraki_ms_ospf:
+      description: Manage OSPF configuration on MS switches
+      name: meraki_ms_ospf
+      namespace: ''
+      version_added: null
+    meraki_ms_stack:
+      description: Modify switch stacking configuration in Meraki.
+      name: meraki_ms_stack
+      namespace: ''
+      version_added: 1.3.0
+    meraki_ms_storm_control:
+      description: Manage storm control configuration on a switch in the Meraki cloud
+      name: meraki_ms_storm_control
+      namespace: ''
+      version_added: 0.0.1
+    meraki_ms_switchport:
+      description: Manage switchports on a switch in the Meraki cloud
+      name: meraki_ms_switchport
+      namespace: ''
+      version_added: null
+    meraki_mx_content_filtering:
+      description: Edit Meraki MX content filtering policies
+      name: meraki_mx_content_filtering
+      namespace: ''
+      version_added: null
+    meraki_mx_intrusion_prevention:
+      description: Manage intrustion prevention in the Meraki cloud
+      name: meraki_mx_intrusion_prevention
+      namespace: ''
+      version_added: null
+    meraki_mx_l2_interface:
+      description: Configure MX layer 2 interfaces
+      name: meraki_mx_l2_interface
+      namespace: ''
+      version_added: 2.1.0
+    meraki_mx_l3_firewall:
+      description: Manage MX appliance layer 3 firewalls in the Meraki cloud
+      name: meraki_mx_l3_firewall
+      namespace: ''
+      version_added: null
+    meraki_mx_l7_firewall:
+      description: Manage MX appliance layer 7 firewalls in the Meraki cloud
+      name: meraki_mx_l7_firewall
+      namespace: ''
+      version_added: null
+    meraki_mx_malware:
+      description: Manage Malware Protection in the Meraki cloud
+      name: meraki_mx_malware
+      namespace: ''
+      version_added: null
+    meraki_mx_nat:
+      description: Manage NAT rules in Meraki cloud
+      name: meraki_mx_nat
+      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
+      namespace: ''
+      version_added: 1.0.0
+    meraki_mx_site_to_site_vpn:
+      description: Manage AutoVPN connections in Meraki
+      name: meraki_mx_site_to_site_vpn
+      namespace: ''
+      version_added: 1.1.0
+    meraki_mx_static_route:
+      description: Manage static routes in the Meraki cloud
+      name: meraki_mx_static_route
+      namespace: ''
+      version_added: null
+    meraki_mx_uplink_bandwidth:
+      description: Manage uplinks on Meraki MX appliances
+      name: meraki_mx_uplink_bandwidth
+      namespace: ''
+      version_added: 1.1.0
+    meraki_mx_vlan:
+      description: Manage VLANs in the Meraki cloud
+      name: meraki_mx_vlan
+      namespace: ''
+      version_added: null
+    meraki_network:
+      description: Manage networks in the Meraki cloud
+      name: meraki_network
+      namespace: ''
+      version_added: null
+    meraki_organization:
+      description: Manage organizations in the Meraki cloud
+      name: meraki_organization
+      namespace: ''
+      version_added: null
+    meraki_snmp:
+      description: Manage organizations in the Meraki cloud
+      name: meraki_snmp
+      namespace: ''
+      version_added: null
+    meraki_syslog:
+      description: Manage syslog server settings in the Meraki cloud.
+      name: meraki_syslog
+      namespace: ''
+      version_added: null
+    meraki_webhook:
+      description: Manage webhooks configured in the Meraki cloud
+      name: meraki_webhook
+      namespace: ''
+      version_added: null
+  netconf: {}
+  shell: {}
+  strategy: {}
+  vars: {}
+version: 2.2.0
diff --git a/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/CHANGELOG.rst b/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/CHANGELOG.rst
new file mode 100644
index 00000000..57e43bcb
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/CHANGELOG.rst
@@ -0,0 +1,116 @@
+==========================
+Cisco.Meraki Release Notes
+==========================
+
+.. contents:: Topics
+
+
+v2.2.0
+======
+
+Minor Changes
+-------------
+
+- meraki_network - Update documentation to show querying of local or remote settings.
+- meraki_ssid - Add Cisco ISE as a splash page option.
+
+Bugfixes
+--------
+
+- meraki_network - Fix bug where local or remote settings always show changed.
+
+v2.1.3
+======
+
+Bugfixes
+--------
+
+- meraki_device - Support pagination. This allows for more than 1,000 devices to be listed at a time.
+- meraki_network - Support pagination. This allows for more than 1,000 networks to be listed at a time.
+
+v2.1.2
+======
+
+Bugfixes
+--------
+
+- Remove test output as it made the collection, and Ansible, huge.
+
+v2.1.1
+======
+
+Bugfixes
+--------
+
+- meraki_management_interface - Fix crash when modifying a non-MX management interface.
+
+v2.1.0
+======
+
+New Modules
+-----------
+
+- meraki_alert - Manage alerts in the Meraki cloud
+- meraki_mx_l2_interface - Configure MX layer 2 interfaces
+
+v2.0.0
+======
+
+Major Changes
+-------------
+
+- Rewrite requests method for version 1.0 API and improved readability
+- meraki_mr_rf_profile - Configure wireless RF profiles.
+- meraki_mr_settings - Configure network settings for wireless.
+- meraki_ms_l3_interface - New module
+- meraki_ms_ospf - Configure OSPF.
+
+Minor Changes
+-------------
+
+- meraki - Add optional debugging for is_update_required() method.
+- meraki_admin - Update endpoints for API v1
+- meraki_alert - Manage network wide alert settings.
+- meraki_device - Added query parameter
+- meraki_intrusion_prevention - Change documentation to show proper way to clear rules
+- meraki_malware - Update documentation to show how to allow multiple URLs at once.
+- meraki_mx_l2_interface - Configure physical interfaces on MX appliances.
+- meraki_mx_uplink - Renamed to meraki_mx_uplink_bandwidth
+- meraki_ssid - Add `WPA3 Only` and `WPA3 Transition Mode`
+- meraki_switchport - Add support for `access_policy_type` parameter
+
+Breaking Changes / Porting Guide
+--------------------------------
+
+- meraki_device - Changed tags from string to list
+- meraki_device - Removed serial_lldp_cdp parameter
+- meraki_device - Removed serial_uplink parameter
+- meraki_intrusion_prevention - Rename whitedlisted_rules to allowed_rules
+- meraki_mx_l3_firewall - Rule responses are now in a `rules` list
+- meraki_mx_l7_firewall - Rename blacklisted_countries to blocked_countries
+- meraki_mx_l7_firewall - Rename whitelisted_countries to allowed_countries
+- meraki_network - Local and remote status page settings cannot be set during network creation
+- meraki_network - `disableRemoteStatusPage` response is now `remote_status_page_enabled`
+- meraki_network - `disable_my_meraki_com` response is now `local_status_page_enabled`
+- meraki_network - `disable_my_meraki` has been deprecated
+- meraki_network - `enable_my_meraki` is now called `local_status_page_enabled`
+- meraki_network - `enable_remote_status_page` is now called `remote_status_page_enabled`
+- meraki_network - `enabled` response for VLAN status is now `vlans_enabled`
+- meraki_network - `tags` and `type` now return a list
+- meraki_snmp - peer_ips is now a list
+- meraki_switchport - `access_policy_number` is now an int and not a string
+- meraki_switchport - `tags` is now a list and not a string
+- meraki_webhook - Querying test status now uses state of query.
+
+Security Fixes
+--------------
+
+- meraki_webhook - diff output may show data for values set to not display
+
+Bugfixes
+--------
+
+- Remove unnecessary files from the collection package, significantly reduces package size
+- meraki_admin - Fix error when adding network privileges to admin using network name
+- meraki_switch_stack - Fix situation where module may crash due to switch being in or not in a stack already
+- meraki_webhook - Proper response is shown when creating webhook test
diff --git a/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/changelog.yaml b/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/changelog.yaml
new file mode 100644
index 00000000..5d955614
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/changelog.yaml
@@ -0,0 +1,138 @@
+ancestor: null
+releases:
+  2.0.0:
+    changes:
+      breaking_changes:
+      - meraki_device - Changed tags from string to list
+      - meraki_device - Removed serial_lldp_cdp parameter
+      - meraki_device - Removed serial_uplink parameter
+      - meraki_intrusion_prevention - Rename whitedlisted_rules to allowed_rules
+      - meraki_mx_l3_firewall - Rule responses are now in a `rules` list
+      - meraki_mx_l7_firewall - Rename blacklisted_countries to blocked_countries
+      - meraki_mx_l7_firewall - Rename whitelisted_countries to allowed_countries
+      - meraki_network - Local and remote status page settings cannot be set during
+        network creation
+      - meraki_network - `disableRemoteStatusPage` response is now `remote_status_page_enabled`
+      - meraki_network - `disable_my_meraki_com` response is now `local_status_page_enabled`
+      - meraki_network - `disable_my_meraki` has been deprecated
+      - meraki_network - `enable_my_meraki` is now called `local_status_page_enabled`
+      - meraki_network - `enable_remote_status_page` is now called `remote_status_page_enabled`
+      - meraki_network - `enabled` response for VLAN status is now `vlans_enabled`
+      - meraki_network - `tags` and `type` now return a list
+      - meraki_snmp - peer_ips is now a list
+      - meraki_switchport - `access_policy_number` is now an int and not a string
+      - meraki_switchport - `tags` is now a list and not a string
+      - meraki_webhook - Querying test status now uses state of query.
+      bugfixes:
+      - Remove unnecessary files from the collection package, significantly reduces
+        package size
+      - meraki_admin - Fix error when adding network privileges to admin using network
+        name
+      - meraki_switch_stack - Fix situation where module may crash due to switch being
+        in or not in a stack already
+      - meraki_webhook - Proper response is shown when creating webhook test
+      major_changes:
+      - Rewrite requests method for version 1.0 API and improved readability
+      - meraki_mr_rf_profile - Configure wireless RF profiles.
+      - meraki_mr_settings - Configure network settings for wireless.
+      - meraki_ms_l3_interface - New module
+      - meraki_ms_ospf - Configure OSPF.
+      minor_changes:
+      - meraki - Add optional debugging for is_update_required() method.
+      - meraki_admin - Update endpoints for API v1
+      - meraki_alert - Manage network wide alert settings.
+      - meraki_device - Added query parameter
+      - meraki_intrusion_prevention - Change documentation to show proper way to clear
+        rules
+      - meraki_malware - Update documentation to show how to allow multiple URLs at
+        once.
+      - meraki_mx_l2_interface - Configure physical interfaces on MX appliances.
+      - meraki_mx_uplink - Renamed to meraki_mx_uplink_bandwidth
+      - meraki_ssid - Add `WPA3 Only` and `WPA3 Transition Mode`
+      - meraki_switchport - Add support for `access_policy_type` parameter
+      security_fixes:
+      - meraki_webhook - diff output may show data for values set to not display
+    fragments:
+    - add-build-ignore.yml
+    - diff_secret_fix.yml
+    - is_update_debug.yml
+    - malware_docs.yml
+    - malware_mx_l2_interface.yml
+    - meraki_admin.yml
+    - meraki_alert.yml
+    - meraki_content_filtering.yml
+    - meraki_device.yml
+    - meraki_firewalled_services.yml
+    - meraki_intrusion_prevention.yml
+    - meraki_malware.yml
+    - meraki_management_interface.yml
+    - meraki_mr_l3_firewall.yml
+    - meraki_mr_rf_profile.yml
+    - meraki_mr_settings.yml
+    - meraki_ms_l3_interface.yml
+    - meraki_ms_ospf.yml
+    - meraki_mx_l3_firewall.yml
+    - meraki_mx_l7_firewall.yml
+    - meraki_mx_uplink.yml
+    - meraki_nat.yml
+    - meraki_network_update.yml
+    - meraki_site_to_site_vpn.yml
+    - meraki_snmp.yml
+    - meraki_ssid.yml
+    - meraki_static_route.yml
+    - meraki_switch_stack.yml
+    - meraki_switch_storm_control.yml
+    - meraki_switchport.yml
+    - meraki_syslog.yml
+    - meraki_vlan.yml
+    - meraki_webhook.yml
+    - requests-rewrite.yml
+    - ssid-tags-fix.yml
+    - ssid_wpa3.yml
+    release_date: '2020-08-27'
+  2.1.0:
+    modules:
+    - description: Manage alerts in the Meraki cloud
+      name: meraki_alert
+      namespace: ''
+    - description: Configure MX layer 2 interfaces
+      name: meraki_mx_l2_interface
+      namespace: ''
+    release_date: '2020-10-16'
+  2.1.1:
+    changes:
+      bugfixes:
+      - meraki_management_interface - Fix crash when modifying a non-MX management
+        interface.
+    fragments:
+    - management_ms_fix.yml
+    release_date: '2020-11-02'
+  2.1.2:
+    changes:
+      bugfixes:
+      - Remove test output as it made the collection, and Ansible, huge.
+    fragments:
+    - size_fix.yml
+    release_date: '2020-11-04'
+  2.1.3:
+    changes:
+      bugfixes:
+      - meraki_device - Support pagination. This allows for more than 1,000 devices
+        to be listed at a time.
+      - meraki_network - Support pagination. This allows for more than 1,000 networks
+        to be listed at a time.
+    fragments:
+    - pagination.yml
+    release_date: '2020-12-16'
+  2.2.0:
+    changes:
+      bugfixes:
+      - meraki_network - Fix bug where local or remote settings always show changed.
+      minor_changes:
+      - meraki_network - Update documentation to show querying of local or remote
+        settings.
+      - meraki_ssid - Add Cisco ISE as a splash page option.
+    fragments:
+    - network_settings_changed.yml
+    - ssid_ise.yml
+    release_date: '2021-02-01'
diff --git a/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/config.yaml b/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/config.yaml
new file mode 100644
index 00000000..99379224
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/cisco/meraki/changelogs/config.yaml
@@ -0,0 +1,29 @@
+changelog_filename_template: CHANGELOG.rst
+changelog_filename_version_depth: 0
+changes_file: changelog.yaml
+changes_format: combined
+keep_fragments: false
+mention_ancestor: true
+new_plugins_after_name: removed_features
+notesdir: fragments
+prelude_section_name: release_summary
+prelude_section_title: Release Summary
+sections:
+- - major_changes
+  - Major Changes
+- - minor_changes
+  - Minor Changes
+- - breaking_changes
+  - Breaking Changes / Porting Guide
+- - deprecated_features
+  - Deprecated Features
+- - removed_features
+  - Removed Features (previously deprecated)
+- - security_fixes
+  - Security Fixes
+- - bugfixes
+  - Bugfixes
+- - known_issues
+  - Known Issues
+title: Cisco.Meraki
+trivial_section_name: trivial