Skip to content

Commit 5618c83

Browse files
Merge pull request #232940 from cilwerner/dirty-pr-release-msid-gtd-tutorial-web-app-redirect-json
[DIRTY PR][MSID] release branch merge conflict with upstream main
2 parents f914352 + f00b2f5 commit 5618c83

File tree

1,250 files changed

+34947
-25310
lines changed

Some content is hidden

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

1,250 files changed

+34947
-25310
lines changed

.openpublishing.publish.config.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -896,6 +896,12 @@
896896
"branch": "docs-snippets",
897897
"branch_mapping": {}
898898
},
899+
{
900+
"path_to_root": "ms-identity-python-webapp",
901+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
902+
"branch": "main",
903+
"branch_mapping": {}
904+
},
899905
{
900906
"path_to_root": "ms-identity-node",
901907
"url": "https://github.com/Azure-Samples/ms-identity-node",
@@ -979,6 +985,7 @@
979985
".openpublishing.redirection.azure-australia.json",
980986
".openpublishing.redirection.azure-databricks.json",
981987
".openpublishing.redirection.azure-hpc.json",
988+
".openpublishing.redirection.azure-kubernetes-service.json",
982989
".openpublishing.redirection.azure-monitor.json",
983990
".openpublishing.redirection.azure-percept.json",
984991
".openpublishing.redirection.azure-productivity.json",

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
7676
"redirect_document_id": false
7777
},
78+
{
79+
"source_path_from_root": "/articles/active-directory/saas-apps/teamzskill-tutorial.md",
80+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
81+
"redirect_document_id": false
82+
},
7883
{
7984
"source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
8085
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/aks/stop-api-upgrade.md",
5+
"redirect_url": "/azure/aks/upgrade-cluster",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@
4545
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/app/correlation.md",
50+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-monitor/app/distributed-tracing.md",
55+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
56+
"redirect_document_id": false
57+
},
4858
{
4959
"source_path_from_root": "/articles/azure-monitor/app/console.md",
5060
"redirect_url": "/previous-versions/azure/azure-monitor/app/console",

0 commit comments

Comments
 (0)