Skip to content

Commit 73deb97

Browse files
WilliamDAssafMSFTWilliamDAssafMSFT
committed
20240801 resolve merge conflict
2 parents 996cccf + 40a7fa1 commit 73deb97

File tree

3,746 files changed

+27873
-30787
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,746 files changed

+27873
-30787
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": "main",
897897
"branch_mapping": {}
898898
},
899+
{
900+
"path_to_root": "storage-mgmt-devguide-dotnet",
901+
"url": "https://github.com/Azure-Samples/storage-mgmt-devguide-dotnet",
902+
"branch": "main",
903+
"branch_mapping": {}
904+
},
899905
{
900906
"path_to_root": "azure-sdk-for-net",
901907
"url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -1300,6 +1306,7 @@
13001306
".openpublishing.redirection.defender-for-iot.json",
13011307
".openpublishing.redirection.dev-spaces.json",
13021308
".openpublishing.redirection.devops-project.json",
1309+
".openpublishing.redirection.dms.json",
13031310
".openpublishing.redirection.document-db.json",
13041311
".openpublishing.redirection.germany.json",
13051312
".openpublishing.redirection.government.json",

‎.openpublishing.redirection.dms.json

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/dms/howto-sql-server-to-azure-sql-mi-powershell.md",
5+
"redirect_url": "/azure/dms/howto-sql-server-to-azure-sql-managed-instance-powershell-offline",
6+
"redirect_document_id": true
7+
},
8+
{
9+
"source_path_from_root": "/articles/dms/known-issues-azure-mysql-online.md",
10+
"redirect_url": "/azure/dms/",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/dms/known-issues-azure-sql-online.md",
15+
"redirect_url": "/azure/dms/",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/dms/resource-custom-roles-sql-database-ads.md",
20+
"redirect_url": "/data-migration/sql-server/database/custom-roles",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/dms/resource-custom-roles-sql-db-managed-instance-ads.md",
25+
"redirect_url": "/data-migration/sql-server/managed-instance/custom-roles",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/dms/resource-custom-roles-sql-db-virtual-machine-ads.md",
30+
"redirect_url": "/data-migration/sql-server/virtual-machines/custom-roles",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/dms/tutorial-mysql-azure-mysql-online.md",
35+
"redirect_url": "/azure/dms/tutorial-mysql-azure-mysql-offline-portal",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/dms/tutorial-rds-mysql-server-azure-db-for-mysql-online.md",
40+
"redirect_url": "/azure/dms/tutorial-mysql-azure-mysql-offline-portal",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/dms/tutorial-rds-sql-server-azure-sql-and-managed-instance-online.md",
45+
"redirect_url": "/azure/dms/",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/dms/tutorial-sql-server-azure-sql-database-offline.md",
50+
"redirect_url": "/data-migration/sql-server/database/database-migration-service",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/dms/tutorial-sql-server-azure-sql-database-offline-ads.md",
55+
"redirect_url": "/data-migration/sql-server/database/database-migration-service",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/dms/tutorial-sql-server-azure-sql-online.md",
60+
"redirect_url": "/azure/dms/tutorial-sql-server-to-azure-sql",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/dms/tutorial-sql-server-managed-instance-offline-ads.md",
65+
"redirect_url": "/data-migration/sql-server/managed-instance/database-migration-service",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/dms/tutorial-sql-server-managed-instance-online-ads.md",
70+
"redirect_url": "/data-migration/sql-server/managed-instance/database-migration-service",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/dms/tutorial-sql-server-to-virtual-machine-offline-ads.md",
75+
"redirect_url": "/data-migration/sql-server/virtual-machines/database-migration-service",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/dms/tutorial-sql-server-to-virtual-machine-online-ads.md",
80+
"redirect_url": "/data-migration/sql-server/virtual-machines/database-migration-service",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path_from_root": "/articles/dms/tutorial-azure-postgresql-to-azure-postgresql-online-portal.md",
85+
"redirect_url": "/azure/postgresql/migrate/migration-service/tutorial-migration-service-single-to-flexible",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path_from_root": "/articles/dms/create-dms-bicep.md",
90+
"redirect_url": "/azure/dms/dms-overview",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path_from_root": "/articles/dms/create-dms-resource-manager-template.md",
95+
"redirect_url": "/azure/dms/dms-overview",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path_from_root": "/articles/dms/how-to-monitor-migration-activity.md",
100+
"redirect_url": "/azure/dms/dms-overview",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path_from_root": "/articles/dms/howto-sql-server-to-azure-sql-managed-instance-powershell-offline.md",
105+
"redirect_url": "/azure/dms/dms-overview",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path_from_root": "/articles/dms/howto-sql-server-to-azure-sql-managed-instance-powershell-online.md",
110+
"redirect_url": "/azure/dms/dms-overview",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path_from_root": "/articles/dms/howto-sql-server-to-azure-sql-powershell.md",
115+
"redirect_url": "/azure/dms/dms-overview",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path_from_root": "/articles/dms/pre-reqs.md",
120+
"redirect_url": "/azure/dms/dms-overview",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/dms/resource-custom-roles-sql-db-managed-instance.md",
125+
"redirect_url": "/azure/dms/dms-overview",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path_from_root": "/articles/dms/quickstart-create-data-migration-service-hybrid-portal.md",
130+
"redirect_url": "/azure/dms/dms-overview",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/articles/dms/quickstart-create-data-migration-service-portal.md",
135+
"redirect_url": "/azure/dms/dms-overview",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path_from_root": "/articles/dms/resource-network-topologies.md",
140+
"redirect_url": "/azure/dms/dms-overview",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path_from_root": "/articles/dms/tutorial-sql-server-managed-instance-online.md",
145+
"redirect_url": "/azure/dms/dms-overview",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path_from_root": "/articles/dms/tutorial-sql-server-to-azure-sql.md",
150+
"redirect_url": "/azure/dms/dms-overview",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path_from_root": "/articles/dms/tutorial-sql-server-to-managed-instance.md",
155+
"redirect_url": "/azure/dms/dms-overview",
156+
"redirect_document_id": false
157+
}
158+
]
159+
}

0 commit comments

Comments
 (0)