Merging upstream version 10.1.0+dfsg.

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

2 files changed, 18 insertions, 5 deletions

diff --git a/ansible_collections/azure/azcollection/meta/execution-environment.yml b/ansible_collections/azure/azcollection/meta/execution-environment.yml
index 08fbf66a3..283dbe334 100644
--- a/ansible_collections/azure/azcollection/meta/execution-environment.yml
+++ b/ansible_collections/azure/azcollection/meta/execution-environment.yml
@@ -1,3 +1,3 @@
 dependencies:
-  python: requirements-azure.txt
+  python: requirements.txt
 version: 1
diff --git a/ansible_collections/azure/azcollection/meta/runtime.yml b/ansible_collections/azure/azcollection/meta/runtime.yml
index 5870f6d89..2da8ce1a3 100644
--- a/ansible_collections/azure/azcollection/meta/runtime.yml
+++ b/ansible_collections/azure/azcollection/meta/runtime.yml
@@ -2,6 +2,7 @@
 requires_ansible: '>=2.14.0'
 action_groups:
   all:
+    - azure.azcollection.azure_rm_accesstoken_info
     - azure.azcollection.azure_rm_account_info
     - azure.azcollection.azure_rm_adapplication
     - azure.azcollection.azure_rm_adapplication_info
@@ -18,6 +19,7 @@ action_groups:
     - azure.azcollection.azure_rm_aksagentpool
     - azure.azcollection.azure_rm_aksagentpool_info
     - azure.azcollection.azure_rm_aksagentpoolversion_info
+    - azure.azcollection.azure_rm_akscredentials_info
     - azure.azcollection.azure_rm_aksupgrade_info
     - azure.azcollection.azure_rm_aksversion_info
     - azure.azcollection.azure_rm_apimanagement
@@ -47,6 +49,7 @@ action_groups:
     - azure.azcollection.azure_rm_bastionhost
     - azure.azcollection.azure_rm_bastionhost_info
     - azure.azcollection.azure_rm_batchaccount
+    - azure.azcollection.azure_rm_batchaccount_info
     - azure.azcollection.azure_rm_cdnendpoint
     - azure.azcollection.azure_rm_cdnendpoint_info
     - azure.azcollection.azure_rm_cdnprofile
@@ -67,8 +70,6 @@ action_groups:
     - azure.azcollection.azure_rm_cosmosdbaccount_info
     - azure.azcollection.azure_rm_datafactory
     - azure.azcollection.azure_rm_datafactory_info
-    - azure.azcollection.azure_rm_datalakestore
-    - azure.azcollection.azure_rm_datalakestore_info
     - azure.azcollection.azure_rm_ddosprotectionplan
     - azure.azcollection.azure_rm_ddosprotectionplan_info
     - azure.azcollection.azure_rm_deployment
@@ -169,12 +170,20 @@ action_groups:
     - azure.azcollection.azure_rm_notificationhub_info
     - azure.azcollection.azure_rm_openshiftmanagedcluster
     - azure.azcollection.azure_rm_openshiftmanagedcluster_info
+    - azure.azcollection.azure_rm_openshiftmanagedclusterkubeconfig_info
     - azure.azcollection.azure_rm_postgresqlconfiguration
     - azure.azcollection.azure_rm_postgresqlconfiguration_info
     - azure.azcollection.azure_rm_postgresqldatabase
     - azure.azcollection.azure_rm_postgresqldatabase_info
     - azure.azcollection.azure_rm_postgresqlfirewallrule
     - azure.azcollection.azure_rm_postgresqlfirewallrule_info
+    - azure.azcollection.azure_rm_postgresqlflexibleconfiguration_info
+    - azure.azcollection.azure_rm_postgresqlflexibledatabase
+    - azure.azcollection.azure_rm_postgresqlflexibledatabase_info
+    - azure.azcollection.azure_rm_postgresqlflexiblefirewallrule
+    - azure.azcollection.azure_rm_postgresqlflexiblefirewallrule_info
+    - azure.azcollection.azure_rm_postgresqlflexibleserver
+    - azure.azcollection.azure_rm_postgresqlflexibleserver_info
     - azure.azcollection.azure_rm_postgresqlserver
     - azure.azcollection.azure_rm_postgresqlserver_info
     - azure.azcollection.azure_rm_privatednsrecordset
@@ -195,6 +204,8 @@ action_groups:
     - azure.azcollection.azure_rm_proximityplacementgroup_info
     - azure.azcollection.azure_rm_publicipaddress
     - azure.azcollection.azure_rm_publicipaddress_info
+    - azure.azcollection.azure_rm_publicipprefix
+    - azure.azcollection.azure_rm_publicipprefix_info
     - azure.azcollection.azure_rm_recoveryservicesvault
     - azure.azcollection.azure_rm_recoveryservicesvault_info
     - azure.azcollection.azure_rm_rediscache
@@ -231,10 +242,12 @@ action_groups:
     - azure.azcollection.azure_rm_sqlelasticpool_info
     - azure.azcollection.azure_rm_sqlfirewallrule
     - azure.azcollection.azure_rm_sqlfirewallrule_info
-    - azure.azcollection.azure_rm_sqlserver
-    - azure.azcollection.azure_rm_sqlserver_info
     - azure.azcollection.azure_rm_sqlmanagedinstance
     - azure.azcollection.azure_rm_sqlmanagedinstance_info
+    - azure.azcollection.azure_rm_sqlserver
+    - azure.azcollection.azure_rm_sqlserver_info
+    - azure.azcollection.azure_rm_sshpublickey
+    - azure.azcollection.azure_rm_sshpublickey_info
     - azure.azcollection.azure_rm_storageaccount
     - azure.azcollection.azure_rm_storageaccount_info
     - azure.azcollection.azure_rm_storageblob