Skip to content

Commit 6850f68

Browse files
authored
Merge branch 'main' into 0124-Update_adf_mariadb_v2
2 parents 2081d72 + 82722c1 commit 6850f68

File tree

15,542 files changed

+356185
-219652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

15,542 files changed

+356185
-219652
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "release-.*"]
2-
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md))" "includes/"]}
2+
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}

.openpublishing.publish.config.json

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,24 @@
176176
"branch": "master",
177177
"branch_mapping": {}
178178
},
179+
{
180+
"path_to_root": "azure_powershell_scripts",
181+
"url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
182+
"branch": "main",
183+
"branch_mapping": {}
184+
},
179185
{
180186
"path_to_root": "powershell_scripts",
181187
"url": "https://github.com/Azure/azure-docs-powershell-samples",
182188
"branch": "master",
183189
"branch_mapping": {}
184190
},
191+
{
192+
"path_to_root": "new_powershell_scripts",
193+
"url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
194+
"branch": "main",
195+
"branch_mapping": {}
196+
},
185197
{
186198
"path_to_root": "policy-templates",
187199
"url": "https://github.com/Azure/azure-policy",
@@ -509,7 +521,7 @@
509521
{
510522
"path_to_root": "azureml-examples-temp-fix",
511523
"url": "https://github.com/Azure/azureml-examples",
512-
"branch": "temp-fix-doc-error",
524+
"branch": "temp-fix",
513525
"branch_mapping": {}
514526
},
515527
{
@@ -944,6 +956,12 @@
944956
"branch": "main",
945957
"branch_mapping": {}
946958
},
959+
{
960+
"path_to_root": "msdocs-quarkus-postgresql-sample-app",
961+
"url": "https://github.com/Azure-Samples/msdocs-quarkus-postgresql-sample-app",
962+
"branch": "main",
963+
"branch_mapping": {}
964+
},
947965
{
948966
"path_to_root": "azuresignalr-samples",
949967
"url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -980,12 +998,36 @@
980998
"branch": "main",
981999
"branch_mapping": {}
9821000
},
1001+
{
1002+
"path_to_root": "cosmos-db-nosql-nodejs-quickstart",
1003+
"url": "https://github.com/azure-samples/cosmos-db-nosql-nodejs-quickstart",
1004+
"branch": "main",
1005+
"branch_mapping": {}
1006+
},
9831007
{
9841008
"path_to_root": "cosmos-db-nosql-python-samples",
9851009
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
9861010
"branch": "main",
9871011
"branch_mapping": {}
9881012
},
1013+
{
1014+
"path_to_root": "cosmos-db-nosql-python-quickstart",
1015+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-quickstart",
1016+
"branch": "main",
1017+
"branch_mapping": {}
1018+
},
1019+
{
1020+
"path_to_root": "cosmos-db-nosql-java-quickstart",
1021+
"url": "https://github.com/azure-samples/cosmos-db-nosql-java-quickstart",
1022+
"branch": "main",
1023+
"branch_mapping": {}
1024+
},
1025+
{
1026+
"path_to_root": "cosmos-db-nosql-go-quickstart",
1027+
"url": "https://github.com/azure-samples/cosmos-db-nosql-go-quickstart",
1028+
"branch": "main",
1029+
"branch_mapping": {}
1030+
},
9891031
{
9901032
"path_to_root": "cosmos-db-mongodb-dotnet-samples",
9911033
"url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
@@ -1129,6 +1171,12 @@
11291171
"url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
11301172
"branch": "main",
11311173
"branch_mapping": {}
1174+
},
1175+
{
1176+
"path_to_root": "azure-iot-operations-samples",
1177+
"url": "https://github.com/Azure-Samples/explore-iot-operations",
1178+
"branch": "main",
1179+
"branch_mapping": {}
11321180
}
11331181
],
11341182
"branch_target_mapping": {
@@ -1166,9 +1214,11 @@
11661214
".openpublishing.redirection.defender-for-cloud.json",
11671215
".openpublishing.redirection.defender-for-iot.json",
11681216
".openpublishing.redirection.iot-hub-device-update.json",
1217+
"articles/site-recovery/.openpublishing.redirection.site-recovery.json",
11691218
".openpublishing.redirection.json",
11701219
".openpublishing.redirection.key-vault.json",
11711220
".openpublishing.redirection.machine-configuration.json",
1221+
".openpublishing.redirection.marketplace.json",
11721222
".openpublishing.redirection.openshift.json",
11731223
".openpublishing.redirection.security-benchmark.json",
11741224
".openpublishing.redirection.sql-database.json",
@@ -1180,6 +1230,8 @@
11801230
"articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
11811231
"articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
11821232
"articles/ai-services/.openpublishing.redirection.cognitive-services.json",
1233+
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
1234+
"articles/energy-data-services/.openpublishing.redirection.energy-data-services.json",
11831235
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
11841236
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
11851237
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -1199,6 +1251,8 @@
11991251
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",
12001252
"articles/event-grid/.openpublishing.redirection.event-grid.json",
12011253
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
1254+
"articles/governance/policy/.openpublishing.redirection.policy.json",
1255+
"articles/governance/policy/.openpublishing.redirection.resource-graph.json",
12021256
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12031257
"articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
12041258
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
@@ -1210,12 +1264,13 @@
12101264
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
12111265
"articles/iot/.openpublishing.redirection.iot.json",
12121266
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
1267+
"articles/iot-operations/.openpublishing.redirection.iot-operations.json",
12131268
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
1269+
"articles/lab-services/.openpublishing.redirection.lab-services.json",
12141270
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
12151271
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
12161272
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
12171273
"articles/mariadb/.openpublishing.redirection.mariadb.json",
1218-
"articles/marketplace/.openpublishing.redirection.marketplace.json",
12191274
"articles/mysql/.openpublishing.redirection.mysql.json",
12201275
"articles/network-watcher/.openpublishing.redirection.network-watcher.json",
12211276
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
@@ -1229,9 +1284,11 @@
12291284
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
12301285
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
12311286
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1287+
"articles/storsimple/.openpublishing.redirection.storsimple.json",
12321288
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
12331289
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
12341290
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1235-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1291+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1292+
"articles/operator-nexus/.openpublishing.redirection.operator-nexus.json"
12361293
]
12371294
}

0 commit comments

Comments
 (0)