Skip to content

Commit 518c3e7

Browse files
aahillaahill
committed
fixing merge conflict
2 parents 3f7bdef + 4a4beb6 commit 518c3e7

File tree

5,615 files changed

+75679
-79698
lines changed

Some content is hidden

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

5,615 files changed

+75679
-79698
lines changed

‎.openpublishing.publish.config.json

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
],
3535
"branches_to_filter": [],
3636
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
37-
"git_repository_branch_open_to_public_contributors": "master",
37+
"git_repository_branch_open_to_public_contributors": "main",
3838
"skip_source_output_uploading": false,
3939
"need_preview_pull_request": true,
4040
"contribution_branch_mappings": {},
@@ -75,6 +75,12 @@
7575
"branch": "master",
7676
"branch_mapping": {}
7777
},
78+
{
79+
"path_to_root": "azure_storage-snippets",
80+
"url": "https://github.com/Azure-Samples/AzureStorageSnippets",
81+
"branch": "master",
82+
"branch_mapping": {}
83+
},
7884
{
7985
"path_to_root": "azure_cli_scripts",
8086
"url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -375,6 +381,12 @@
375381
"branch": "main",
376382
"branch_mapping": {}
377383
},
384+
{
385+
"path_to_root": "media-services-v3-python",
386+
"url": "https://github.com/Azure-Samples/media-services-v3-python",
387+
"branch": "main",
388+
"branch_mapping": {}
389+
},
378390
{
379391
"path_to_root": "samples-javascript",
380392
"url": "https://github.com/Microsoft/tsiclient",
@@ -405,12 +417,6 @@
405417
"branch": "main",
406418
"branch_mapping": {}
407419
},
408-
{
409-
"path_to_root": "media-services-v3-python",
410-
"url": "https://github.com/Azure-Samples/media-services-v3-python",
411-
"branch": "main",
412-
"branch_mapping": {}
413-
},
414420
{
415421
"path_to_root": "remote-monitoring-webui",
416422
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -801,6 +807,12 @@
801807
"branch": "master",
802808
"branch_mapping": {}
803809
},
810+
{
811+
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
812+
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
813+
"branch": "master",
814+
"branch_mapping": {}
815+
},
804816
{
805817
"path_to_root": "msdocs-python-flask-webapp-quickstart",
806818
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -818,6 +830,18 @@
818830
"url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
819831
"branch": "main",
820832
"branch_mapping": {}
833+
},
834+
{
835+
"path_to_root": "msdocs-django-postgresql-sample-app",
836+
"url": "https://github.com/Azure-Samples/msdocs-django-postgresql-sample-app",
837+
"branch": "main",
838+
"branch_mapping": {}
839+
},
840+
{
841+
"path_to_root": "msdocs-flask-postgresql-sample-app",
842+
"url": "https://github.com/Azure-Samples/msdocs-flask-postgresql-sample-app",
843+
"branch": "main",
844+
"branch_mapping": {}
821845
}
822846
],
823847
"branch_target_mapping": {
@@ -881,10 +905,13 @@
881905
"articles/purview/.openpublishing.redirection.purview.json",
882906
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
883907
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
908+
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
884909
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
885910
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
886911
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
887912
"articles/mysql/.openpublishing.redirection.mysql.json",
888-
"articles/container-apps/.openpublishing.redirection.container-apps.json"
913+
"articles/container-apps/.openpublishing.redirection.container-apps.json",
914+
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
915+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
889916
]
890-
}
917+
}

‎.openpublishing.redirection.active-directory.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3483,7 +3483,7 @@
34833483
{
34843484
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-enable.md",
34853485
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
3486-
"redirect_document_id": true
3486+
"redirect_document_id": false
34873487
},
34883488
{
34893489
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-faqs.md",
@@ -3498,7 +3498,7 @@
34983498
{
34993499
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-overview.md",
35003500
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-overview",
3501-
"redirect_document_id": true
3501+
"redirect_document_id": false
35023502
},
35033503
{
35043504
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-troubleshooting.md",
@@ -3510,6 +3510,11 @@
35103510
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-windows-settings-reference",
35113511
"redirect_document_id": true
35123512
},
3513+
{
3514+
"source_path_from_root": "/articles/active-directory/devices/enterprise-state-roaming-overview.md",
3515+
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
3516+
"redirect_document_id": true
3517+
},
35133518
{
35143519
"source_path_from_root": "/articles/active-directory/device-management-faq.md",
35153520
"redirect_url": "/azure/active-directory/devices/faq",

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@
2424
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-overview.md",
2525
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
2626
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-monitor/app/change-analysis.md",
30+
"redirect_url": "/azure/azure-monitor/change/change-analysis",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-visualizations.md",
35+
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-troubleshoot.md",
40+
"redirect_url": "/azure/azure-monitor/change/change-analysis-troubleshoot",
41+
"redirect_document_id": false
2742
}
43+
2844
]
2945
}

‎.openpublishing.redirection.azure-sql.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,23 @@
175175
"redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-train?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
176176
"redirect_document_id": false
177177
},
178+
{
179+
"source_path_from_root": "/articles/azure-sql/database/auto-failover-group-overview.md",
180+
"redirect_url": "/azure/azure-sql/database/auto-failover-group-sql-db",
181+
"redirect_document_id": true
182+
},
183+
{
184+
"source_path_from_root": "/articles/azure-sql/database/auto-failover-group-configure.md",
185+
"redirect_url": "/azure/azure-sql/database/auto-failover-group-configure-sql-db",
186+
"redirect_document_id": true
187+
},
178188
{
179189
"source_path_from_root": "/articles/azure-sql/database/job-automation-managed-instances.md",
180190
"redirect_url": "/azure/azure-sql/managed-instance/job-automation-managed-instance",
181191
"redirect_document_id": true
182192
},
183193
{
184-
"source_path": "articles/azure-sql/database/service-tiers-general-purpose-business-critical.md",
194+
"source_path_from_root": "/articles/azure-sql/database/service-tiers-general-purpose-business-critical.md",
185195
"redirect_url": "/azure/azure-sql/database/service-tiers-vcore",
186196
"redirect_document_id": false
187197
}

‎.openpublishing.redirection.defender-for-cloud.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@
6060
"redirect_url": "/azure/defender-for-cloud/os-coverage",
6161
"redirect_document_id": false
6262
},
63+
{
64+
"source_path_from_root": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds.md",
65+
"redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
66+
"redirect_document_id": false
67+
},
6368
{
6469
"source_path_from_root": "/articles/security-center/security-center-just-in-time.md",
6570
"redirect_url": "/azure/defender-for-cloud/just-in-time-access-usage",
@@ -632,7 +637,7 @@
632637
},
633638
{
634639
"source_path_from_root": "/articles/security-center/supported-machines-endpoint-solutions-clouds.md",
635-
"redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds",
640+
"redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
636641
"redirect_document_id": true
637642
},
638643
{

0 commit comments

Comments
 (0)