Skip to content

Commit 59fa538

Browse files
GitHubber17GitHubber17
committed
fix merge conflict
2 parents 255a9db + 45ba3e4 commit 59fa538

File tree

3,651 files changed

+50833
-53378
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,651 files changed

+50833
-53378
lines changed

‎.openpublishing.publish.config.json

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,18 @@
7474
"branch": "master",
7575
"branch_mapping": {}
7676
},
77+
{
78+
"path_to_root": "ms-identity-docs-code-dotnet",
79+
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-dotnet",
80+
"branch": "main",
81+
"branch_mapping": {}
82+
},
83+
{
84+
"path_to_root": "ms-identity-javascript-react-docs",
85+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-react-docs",
86+
"branch": "main",
87+
"branch_mapping": {}
88+
},
7789
{
7890
"path_to_root": "ms-identity-docs-code-javascript",
7991
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-javascript",
@@ -86,6 +98,48 @@
8698
"branch": "main",
8799
"branch_mapping": {}
88100
},
101+
{
102+
"path_to_root": "ms-identity-javascript-v2",
103+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
104+
"branch": "master",
105+
"branch_mapping": {}
106+
},
107+
{
108+
"path_to_root": "ms-identity-python-webapp-quickstart",
109+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
110+
"branch": "0.7.0",
111+
"branch_mapping": {}
112+
},
113+
{
114+
"path_to_root": "ms-identity-python-webapp-tutorial",
115+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
116+
"branch": "0.6.0",
117+
"branch_mapping": {}
118+
},
119+
{
120+
"path_to_root": "ms-identity-node",
121+
"url": "https://github.com/Azure-Samples/ms-identity-node",
122+
"branch": "main",
123+
"branch_mapping": {}
124+
},
125+
{
126+
"path_to_root": "ms-identity-javascript-nodejs-desktop",
127+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
128+
"branch": "main",
129+
"branch_mapping": {}
130+
},
131+
{
132+
"path_to_root": "ms-identity-b2c-javascript-spa",
133+
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
134+
"branch": "main",
135+
"branch_mapping": {}
136+
},
137+
{
138+
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
139+
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
140+
"branch": "master",
141+
"branch_mapping": {}
142+
},
89143
{
90144
"path_to_root": "_themes",
91145
"url": "https://github.com/Microsoft/templates.docs.msft",
@@ -404,12 +458,6 @@
404458
"branch": "master",
405459
"branch_mapping": {}
406460
},
407-
{
408-
"path_to_root": "ms-identity-docs-code-dotnet",
409-
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-dotnet",
410-
"branch": "main",
411-
"branch_mapping": {}
412-
},
413461
{
414462
"path_to_root": "remote-monitoring-webui",
415463
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -764,12 +812,6 @@
764812
"branch": "master",
765813
"branch_mapping": {}
766814
},
767-
{
768-
"path_to_root": "ms-identity-javascript-react-docs",
769-
"url": "https://github.com/Azure-Samples/ms-identity-javascript-react-docs",
770-
"branch": "main",
771-
"branch_mapping": {}
772-
},
773815
{
774816
"path_to_root": "cognitive-services-quickstart-code",
775817
"url": "https://github.com/Azure-Samples/cognitive-services-quickstart-code",
@@ -884,24 +926,6 @@
884926
"branch": "master",
885927
"branch_mapping": {}
886928
},
887-
{
888-
"path_to_root": "ms-identity-b2c-javascript-spa",
889-
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
890-
"branch": "main",
891-
"branch_mapping": {}
892-
},
893-
{
894-
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
895-
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
896-
"branch": "master",
897-
"branch_mapping": {}
898-
},
899-
{
900-
"path_to_root": "ms-identity-javascript-v2",
901-
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
902-
"branch": "master",
903-
"branch_mapping": {}
904-
},
905929
{
906930
"path_to_root": "msdocs-python-flask-webapp-quickstart",
907931
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -956,30 +980,6 @@
956980
"branch": "docs-snippets",
957981
"branch_mapping": {}
958982
},
959-
{
960-
"path_to_root": "ms-identity-python-webapp-quickstart",
961-
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
962-
"branch": "0.7.0",
963-
"branch_mapping": {}
964-
},
965-
{
966-
"path_to_root": "ms-identity-python-webapp-tutorial",
967-
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
968-
"branch": "0.6.0",
969-
"branch_mapping": {}
970-
},
971-
{
972-
"path_to_root": "ms-identity-node",
973-
"url": "https://github.com/Azure-Samples/ms-identity-node",
974-
"branch": "main",
975-
"branch_mapping": {}
976-
},
977-
{
978-
"path_to_root": "ms-identity-javascript-nodejs-desktop",
979-
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
980-
"branch": "main",
981-
"branch_mapping": {}
982-
},
983983
{
984984
"path_to_root": "cosmos-db-nosql-dotnet-samples",
985985
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",

‎.openpublishing.redirection.azure-attestation.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"source_path_from_root": "/articles/attestation/audit-logs.md",
55
"redirect_url": "/azure/attestation/view-logs",
66
"redirect_document_id": true
7+
},
8+
{
9+
"source_path_from_root": "/articles/attestation/azure-diagnostic-monitoring.md",
10+
"redirect_url": "/azure/attestation/enable-logging",
11+
"redirect_document_id": true
712
}
813
]
914
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6374,15 +6374,45 @@
63746374
"redirect_url": "/azure/azure-monitor/app/search-and-transaction-diagnostics?tabs=transaction-diagnostics",
63756375
"redirect_document_id": false
63766376
},
6377+
{
6378+
"source_path_from_root": "/articles/azure-monitor/app/separate-resources.md",
6379+
"redirect_url": "/azure/azure-monitor/app/create-workspace-resource#how-many-application-insights-resources-should-i-deploy",
6380+
"redirect_document_id": false
6381+
},
6382+
{
6383+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-app-dashboards.md",
6384+
"redirect_url": "/azure/azure-monitor/app/overview-dashboard#create-custom-kpi-dashboards-using-application-insights",
6385+
"redirect_document_id": false
6386+
},
6387+
{
6388+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-asp-net-core.md",
6389+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-asp-net-core",
6390+
"redirect_document_id": false
6391+
},
6392+
{
6393+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-asp-net-custom-metrics.md",
6394+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-asp-net-custom-metrics",
6395+
"redirect_document_id": false
6396+
},
6397+
{
6398+
"source_path_from_root": "/articles/azure-monitor/app/data-retention-privacy.md",
6399+
"redirect_url": "/azure/azure-monitor/app/app-insights-overview#how-does-application-insights-handle-data-collection-retention-storage-and-privacy",
6400+
"redirect_document_id": false
6401+
},
6402+
{
6403+
"source_path_from_root": "/articles/azure-monitor/essentials/metrics-getting-started.md",
6404+
"redirect_url": "/azure/azure-monitor/essentials/analyze-metrics",
6405+
"redirect_document_id": false
6406+
},
63776407
{
63786408
"source_path_from_root": "/articles/azure-monitor/essentials/metrics-dynamic-scope.md",
6379-
"redirect_url": "/azure/azure-monitor/essentials/metrics-getting-started",
6409+
"redirect_url": "/azure/azure-monitor/essentials/analyze-metrics",
63806410
"redirect_document_id": false
63816411
},
63826412
{
63836413
"source_path_from_root": "/articles/azure-monitor/essentials/metrics-charts.md",
6384-
"redirect_url": "/azure/azure-monitor/essentials/metrics-getting-started",
6414+
"redirect_url": "/azure/azure-monitor/essentials/analyze-metrics",
63856415
"redirect_document_id": false
6386-
}
6416+
}
63876417
]
63886418
}

‎.openpublishing.redirection.azure-productivity.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,16 @@
204204
"source_path": "articles/lab-services/how-to-create-lab-template.md",
205205
"redirect_url": "/azure/lab-services/how-to-create-lab-bicep",
206206
"redirect_document_id": false
207+
},
208+
{
209+
"source_path": "articles/lab-services/migrate-to-2022-update.md",
210+
"redirect_url": "/azure/lab-services/how-to-migrate-lab-acounts-to-lab-plans",
211+
"redirect_document_id": true
212+
},
213+
{
214+
"source_path": "articles/lab-services/lab-services-whats-new.md",
215+
"redirect_url": "/azure/lab-services/concept-lab-accounts-versus-lab-plans",
216+
"redirect_document_id": true
207217
}
208218
]
209219
}

0 commit comments

Comments
 (0)