Skip to content

Commit bfb8647

Browse files
authored
Merge branch 'main' into patch-11
2 parents 5f3d6f3 + 3bb8727 commit bfb8647

File tree

2,086 files changed

+24778
-18428
lines changed

Some content is hidden

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

2,086 files changed

+24778
-18428
lines changed

.openpublishing.publish.config.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,12 @@
974974
"branch": "main",
975975
"branch_mapping": {}
976976
},
977+
{
978+
"path_to_root": "azure-typescript-e2e-apps",
979+
"url": "https://github.com/Azure-Samples/azure-typescript-e2e-apps",
980+
"branch": "main",
981+
"branch_mapping": {}
982+
},
977983
{
978984
"path_to_root": "azure-webpubsub",
979985
"url": "https://github.com/Azure/azure-webpubsub",
@@ -1183,6 +1189,12 @@
11831189
"url": "https://github.com/Azure-Samples/explore-iot-operations",
11841190
"branch": "main",
11851191
"branch_mapping": {}
1192+
},
1193+
{
1194+
"path_to_root": "SupportArticles-docs",
1195+
"url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
1196+
"branch": "main",
1197+
"branch_mapping": {}
11861198
}
11871199
],
11881200
"branch_target_mapping": {
@@ -1232,6 +1244,7 @@
12321244
".openpublishing.redirection.government.json",
12331245
".openpublishing.redirection.guidance.json",
12341246
".openpublishing.redirection.industry.json",
1247+
".openpublishing.redirection.iot-accelerators.json",
12351248
".openpublishing.redirection.iot-develop.json",
12361249
".openpublishing.redirection.iot-hub-device-update.json",
12371250
".openpublishing.redirection.json",
@@ -1297,7 +1310,6 @@
12971310
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12981311
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
12991312
"articles/internet-peering/.openpublishing.redirection.internet-peering.json",
1300-
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
13011313
"articles/iot-central/.openpublishing.redirection.iot-central.json",
13021314
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
13031315
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",

.openpublishing.redirection.container-service.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"redirect_document_id": false
77
},
88
{
9+
910
"source_path_from_root": "/articles/container-service/dcos-swarm/container-service-application-specific-marathon.md",
1011
"redirect_url": "/previous-versions/azure/container-service/dcos-swarm/container-service-application-specific-marathon",
1112
"redirect_document_id": false
Lines changed: 192 additions & 32 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)