Skip to content

Commit b231873

Browse files
authored
Merge branch 'main' into adh-ultra-ssd-vk
2 parents 20a38e4 + 2575a7a commit b231873

File tree

7,770 files changed

+123232
-78058
lines changed

Some content is hidden

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

7,770 files changed

+123232
-78058
lines changed

.openpublishing.publish.config.json

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,12 @@
434434
"branch": "main",
435435
"branch_mapping": {}
436436
},
437+
{
438+
"path_to_root": "media-services-video-indexer",
439+
"url": "https://github.com/Azure-Samples/media-services-video-indexer",
440+
"branch": "master",
441+
"branch_mapping": {}
442+
},
437443
{
438444
"path_to_root": "remote-monitoring-webui",
439445
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -467,7 +473,7 @@
467473
{
468474
"path_to_root": "azureml-examples-online-endpoint-vnet",
469475
"url": "https://github.com/azure/azureml-examples",
470-
"branch": "rsethur/mvnet",
476+
"branch": "main",
471477
"branch_mapping": {}
472478
},
473479
{
@@ -626,6 +632,12 @@
626632
"branch": "master",
627633
"branch_mapping": {}
628634
},
635+
{
636+
"path_to_root": "samples-cosmosdb-mongodb-javascript",
637+
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-javascript-samples",
638+
"branch": "main",
639+
"branch_mapping": {}
640+
},
629641
{
630642
"path_to_root": "samples-cosmosdb-java-v4-web-app",
631643
"url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
@@ -913,6 +925,18 @@
913925
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
914926
"branch": "main",
915927
"branch_mapping": {}
928+
},
929+
{
930+
"path_to_root": "azure-cosmos-dotnet-v3",
931+
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
932+
"branch": "v3",
933+
"branch_mapping": {}
934+
},
935+
{
936+
"path_to_root": "azure-cosmos-mongodb-dotnet",
937+
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
938+
"branch": "quickstart-test",
939+
"branch_mapping": {}
916940
}
917941
],
918942
"branch_target_mapping": {
@@ -930,13 +954,15 @@
930954
},
931955
"redirection_files": [
932956
".openpublishing.redirection.json",
957+
".openpublishing.redirection.azure-arc-data.json",
933958
".openpublishing.redirection.active-directory.json",
934959
".openpublishing.redirection.azure-blob.json",
935960
"articles/data-factory/.openpublishing.redirection.data-factory.json",
936961
".openpublishing.redirection.defender-for-cloud.json",
937962
".openpublishing.redirection.defender-for-iot.json",
938963
".openpublishing.redirection.healthcare-apis.json",
939964
".openpublishing.redirection.iot-hub.json",
965+
".openpublishing.redirection.app-service.json",
940966
".openpublishing.redirection.key-vault.json",
941967
".openpublishing.redirection.sql-database.json",
942968
".openpublishing.redirection.security-benchmark.json",
@@ -979,6 +1005,7 @@
9791005
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
9801006
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
9811007
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
982-
"articles/machine-learning/.openpublishing.redirection.machine-learning.json"
1008+
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1009+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
9831010
]
9841011
}

.openpublishing.redirection.active-directory.json

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,11 @@
355355
"redirect_url": "/azure/active-directory/saas-apps/mimecast-personal-portal-tutorial",
356356
"redirect_document_id": false
357357
},
358+
{
359+
"source_path_from_root": "/articles/active-directory/saas-apps/carlsonwagonlit-tutorial.md",
360+
"redirect_url": "/azure/active-directory/saas-apps/cwt-tutorial",
361+
"redirect_document_id": false
362+
},
358363
{
359364
"source_path_from_root": "/articles/active-directory/active-directory-saas-fax.plus-tutorial.md",
360365
"redirect_url": "/articles/active-directory/saas-apps/fax-plus-tutorial",
@@ -2785,6 +2790,7 @@
27852790
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
27862791
"redirect_document_id": false
27872792
},
2793+
27882794
{
27892795
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
27902796
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4510,6 +4516,11 @@
45104516
"redirect_url": "azure/active-directory/hybrid/what-is-inter-directory-provisioning",
45114517
"redirect_document_id": false
45124518
},
4519+
{
4520+
"source_path_from_root": "/articles/active-directory/hybrid/how-to-connect-group-writeback.md",
4521+
"redirect_url": "/azure/active-directory/hybrid/how-to-connect-group-writeback-v2",
4522+
"redirect_document_id": false
4523+
},
45134524
{
45144525
"source_path_from_root": "/articles/active-directory/cloud-provisioning/tutorial-single-forest.md",
45154526
"redirect_url": "/azure/active-directory/cloud-sync/tutorial-single-forest",
@@ -8782,13 +8793,13 @@
87828793
},
87838794
{
87848795
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-provisioning-tutorial.md",
8785-
"redirect_url": "/azure/active-directory/saas-apps/linkedinlearning-provisioning-tutorial",
8796+
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
87868797
"redirect_document_id": false
87878798
},
87888799
{
87898800
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedin-learning-provisioning-tutorial.md",
8790-
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
8791-
"redirect_document_id": true
8801+
"redirect_url": "/azure",
8802+
"redirect_document_id": false
87928803
},
87938804
{
87948805
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-tutorial.md",
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/app-service-web/web-sites-restore.md",
5+
"redirect_url": "/azure/app-service/manage-backup",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/app-service/web-sites-restore.md",
10+
"redirect_url": "/azure/app-service/manage-backup",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/app-service/app-service-web-restore-snapshots.md",
15+
"redirect_url": "/azure/app-service/manage-backup",
16+
"redirect_document_id": false
17+
}
18+
]
19+
}
Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-arc/data/deploy-byok-active-directory-connector.md",
5+
"redirect_url": "/azure/azure-arc/data/deploy-customer-managed-keytab-active-directory-connector",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-dag.md",
10+
"redirect_url": "/cli/azure/sql/instance-failover-group-arc",
11+
"redirect_document_id":false
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-arc/data/retrieve-the-username-password-for-data-controller.md",
15+
"redirect_url": "/azure/azure-arc/data/update-service-principal-credentials",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/azure-arc/data/create-aks-cluster-data-controller.md",
20+
"redirect_url": "/azure/azure-arc/data/create-complete-managed-instance-indirectly-connected",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-arc/data/how-to-apply-security-context-constraint.md",
25+
"redirect_url": "/azure/azure-arc/data",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode-prerequisites.md",
30+
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode.md",
35+
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller.md",
40+
"redirect_url": "/azure/azure-arc/data/plan-azure-arc-data-services",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-azure-data-studio.md",
45+
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-data-studio",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/azure-arc/data/data-controller-resource-in-azure-portal.md",
50+
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-portal",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-cli.md",
55+
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-cli",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-azdata.md",
60+
"redirect_url": "/azure/azure-arc/data/create-data-controller-using-cli",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/azure-arc/data/scale-out-postgresql-hyperscale-server-group.md",
65+
"redirect_url": "/azure/azure-arc/data/scale-out-in-postgresql-hyperscale-server-group",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/azure-arc/data/known-issues.md",
70+
"redirect_url": "/azure/azure-arc/data/release-notes",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/azure-arc/data/reference/overview.md",
75+
"redirect_url": "/azure/azure-arc/data/reference/reference-az-arcdata",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-k8s-native-tools.md",
80+
"redirect_url": "/azure/azure-arc/data/create-data-controller-using-kubernetes-native-tools",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-k8s-native-tools.md",
85+
"redirect_url": "/azure/azure-arc/data/create-postgresql-hyperscale-server-group-kubernetes-native-tools",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path_from_root": "/articles/azure-arc/data/create-sql-managed-instance-using-k8s-native-tools.md",
90+
"redirect_url": "/azure/azure-arc/data/create-sql-managed-instance-using-kubernetes-native-tools",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata.md",
95+
"redirect_url": "/cli/azure/arcdata",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-ad-connector.md",
100+
"redirect_url": "/cli/azure/arcdata",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc.md",
105+
"redirect_url": "/cli/azure/arcdata/dc",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-config.md",
110+
"redirect_url": "/cli/azure/arcdata/dc/config",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-debug.md",
115+
"redirect_url": "/cli/azure/arcdata/dc/debug",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-endpoint.md",
120+
"redirect_url": "/cli/azure/arcdata/dc/debug",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-status.md",
125+
"redirect_url": "/cli/azure/arcdata/dc/status",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-resource-kind.md",
130+
"redirect_url": "/cli/azure/arcdata/resource-kind",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-postgres-arc-server.md",
135+
"redirect_url": "/cli/azure/postgres/arc-server",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-postgres-arc-server-endpoint.md",
140+
"redirect_url": "/cli/azure/postgres/arc-server/endpoint",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-instance-failover-group-arc.md",
145+
"redirect_url": "/cli/azure/sql/instance-failover-group-arc",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc.md",
150+
"redirect_url": "/cli/azure/sql/mi-arc",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-config.md",
155+
"redirect_url": "/cli/azure/sql/mi-arc/config",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-endpoint.md",
160+
"redirect_url": "/cli/azure/sql/mi-arc/endpoint",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-midb-arc.md",
165+
"redirect_url": "/cli/azure/sql/midb-arc",
166+
"redirect_document_id": false
167+
}
168+
]
169+
}

0 commit comments

Comments
 (0)