Skip to content

Commit 52d8988

Browse files
authored
Merge pull request #272425 from ankitaduttaMSFT/release-asr-shared-disk
committing to fix the RB conflicts - Dirty PR
2 parents a9fb597 + 78b6979 commit 52d8988

File tree

3,130 files changed

+47052
-37490
lines changed

Some content is hidden

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

3,130 files changed

+47052
-37490
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|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}
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/|resource-graph/samples/))"]}

.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.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32725,6 +32725,11 @@
3272532725
"redirect_url": "/azure/active-directory/governance/licensing-fundamentals",
3272632726
"redirect_document_id": false
3272732727
},
32728+
{
32729+
"source_path": "articles/active-directory/azuread-dev/index.yml",
32730+
"redirect_url": "/entra/identity-platform",
32731+
"redirect_document_id": false
32732+
},
3272832733
{
3272932734
"source_path": "articles/active-directory/azuread-dev/about-microsoft-identity-platform.md",
3273032735
"redirect_url": "/previous-versions/azure/active-directory/azuread-dev/about-microsoft-identity-platform",

.openpublishing.redirection.azure-monitor.json

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4131,7 +4131,7 @@
41314131
},
41324132
{
41334133
"source_path_from_root": "/articles/azure-monitor/platform/alerts-using-migration-tool.md",
4134-
"redirect_url": "/azure/azure-monitor/alerts/alerts-using-migration-tool",
4134+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
41354135
"redirect_document_id": false
41364136
},
41374137
{
@@ -6259,6 +6259,46 @@
62596259
"redirect_url": "/previous-versions/azure/azure-monitor/autoscale/tutorial-autoscale-performance-schedule",
62606260
"redirect_document_id": false
62616261
},
6262+
{
6263+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-automatic-migration.md",
6264+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-automatic-migration",
6265+
"redirect_document_id": false
6266+
},
6267+
{
6268+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-classic.overview.md",
6269+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-classic.overview",
6270+
"redirect_document_id": false
6271+
},
6272+
{
6273+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-classic-portal.md",
6274+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-classic-portal",
6275+
"redirect_document_id": false
6276+
},
6277+
{
6278+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-enable-template.md",
6279+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-enable-template",
6280+
"redirect_document_id": false
6281+
},
6282+
{
6283+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-prepare-migration.md",
6284+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-prepare-migration",
6285+
"redirect_document_id": false
6286+
},
6287+
{
6288+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-understand-migration.md",
6289+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-understand-migration",
6290+
"redirect_document_id": false
6291+
},
6292+
{
6293+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-webhooks.md",
6294+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-webhooks",
6295+
"redirect_document_id": false
6296+
},
6297+
{
6298+
"source_path_from_root": "/articles/azure-monitor/alerts/api-alerts.md",
6299+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/api-alerts",
6300+
"redirect_document_id": false
6301+
},
62626302
{
62636303
"source_path_from_root": "/articles/azure-monitor/essentials/metrics-supported.md",
62646304
"redirect_url": "/azure/azure-monitor/reference/supported-metrics/metrics-index",
@@ -6621,7 +6661,12 @@
66216661
},
66226662
{
66236663
"source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
6624-
"redirect_url": "/azure/azure-monitor/overview",
6664+
"redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
6665+
"redirect_document_id": false
6666+
},
6667+
{
6668+
"source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
6669+
"redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
66256670
"redirect_document_id": false
66266671
},
66276672
{
@@ -6644,5 +6689,6 @@
66446689
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-create-edit?tabs=arm#manually-create-a-dcr",
66456690
"redirect_document_id": false
66466691
}
6692+
66476693
]
66486694
}

.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

0 commit comments

Comments
 (0)