Skip to content

Commit 8ff2f11

Browse files
authored
Merge branch 'main' into main
2 parents 76fec26 + 50c02bc commit 8ff2f11

File tree

10,217 files changed

+184707
-147558
lines changed

Some content is hidden

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

10,217 files changed

+184707
-147558
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: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,12 +998,36 @@
998998
"branch": "main",
999999
"branch_mapping": {}
10001000
},
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+
},
10011007
{
10021008
"path_to_root": "cosmos-db-nosql-python-samples",
10031009
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
10041010
"branch": "main",
10051011
"branch_mapping": {}
10061012
},
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+
},
10071031
{
10081032
"path_to_root": "cosmos-db-mongodb-dotnet-samples",
10091033
"url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
@@ -1193,6 +1217,7 @@
11931217
".openpublishing.redirection.json",
11941218
".openpublishing.redirection.key-vault.json",
11951219
".openpublishing.redirection.machine-configuration.json",
1220+
".openpublishing.redirection.marketplace.json",
11961221
".openpublishing.redirection.openshift.json",
11971222
".openpublishing.redirection.security-benchmark.json",
11981223
".openpublishing.redirection.sql-database.json",
@@ -1204,6 +1229,8 @@
12041229
"articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
12051230
"articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
12061231
"articles/ai-services/.openpublishing.redirection.cognitive-services.json",
1232+
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
1233+
"articles/energy-data-services/.openpublishing.redirection.energy-data-services.json",
12071234
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
12081235
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
12091236
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -1223,6 +1250,8 @@
12231250
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",
12241251
"articles/event-grid/.openpublishing.redirection.event-grid.json",
12251252
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
1253+
"articles/governance/policy/.openpublishing.redirection.policy.json",
1254+
"articles/governance/policy/.openpublishing.redirection.resource-graph.json",
12261255
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12271256
"articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
12281257
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
@@ -1236,11 +1265,11 @@
12361265
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
12371266
"articles/iot-operations/.openpublishing.redirection.iot-operations.json",
12381267
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
1268+
"articles/lab-services/.openpublishing.redirection.lab-services.json",
12391269
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
12401270
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
12411271
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
12421272
"articles/mariadb/.openpublishing.redirection.mariadb.json",
1243-
"articles/marketplace/.openpublishing.redirection.marketplace.json",
12441273
"articles/mysql/.openpublishing.redirection.mysql.json",
12451274
"articles/network-watcher/.openpublishing.redirection.network-watcher.json",
12461275
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
@@ -1249,11 +1278,14 @@
12491278
"articles/purview/.openpublishing.redirection.purview.json",
12501279
"articles/route-server/.openpublishing.redirection.route-server.json",
12511280
"articles/sap/.openpublishing.redirection.sap.json",
1281+
"articles/security/.openpublishing.redirection.security.json",
12521282
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
1283+
"articles/site-recovery/.openpublishing.redirection.site-recovery.json",
12531284
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
12541285
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
12551286
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
12561287
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1288+
"articles/storsimple/.openpublishing.redirection.storsimple.json",
12571289
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
12581290
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
12591291
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",

0 commit comments

Comments
 (0)