Skip to content

Commit ca8152c

Browse files
AbbyMSFTAbbyMSFT
committed
resolve merge conflict
2 parents b7c888f + b3f59dd commit ca8152c

File tree

1,026 files changed

+15665
-7695
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,026 files changed

+15665
-7695
lines changed

‎.openpublishing.redirection.active-directory.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10776,13 +10776,13 @@
1077610776
"redirect_document_id": false
1077710777
},
1077810778
{
10779-
"source_path": "articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md",
10780-
"redirect_url": "/azure/active-directory/reports-monitoring/overview-monitoring",
10779+
"source_path": "articles/active-directory/manage-apps/get-it-now-azure-marketplace.md",
10780+
"redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
1078110781
"redirect_document_id": false
1078210782
},
1078310783
{
10784-
"source_path": "articles/active-directory/manage-apps/get-it-now-azure-marketplace.md",
10785-
"redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
10784+
"source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
10785+
"redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
1078610786
"redirect_document_id": false
1078710787
}
1078810788

‎.openpublishing.redirection.iot-hub.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,11 @@
10141014
"redirect_url": "/azure/iot-hub/iot-hub-device-management-iot-toolkit",
10151015
"redirect_document_id": false
10161016
},
1017+
{
1018+
"source_path_from_root": "/articles/iot-hub/iot-hub-protocol-gateway.md",
1019+
"redirect_url": "/azure/iot-edge/iot-edge-as-gateway",
1020+
"redirect_document_id": false
1021+
},
10171022
{
10181023
"source_path_from_root": "/articles/iot-hub/iot-hub-visual-studio-cloud-device-messaging.md",
10191024
"redirect_url": "/azure/iot-hub/iot-hub-vscode-iot-toolkit-cloud-device-messaging",

‎.openpublishing.redirection.json

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16603,6 +16603,11 @@
1660316603
"redirect_url": "/azure/devtest-labs/devtest-lab-create-environment-from-arm",
1660416604
"redirect_document_id": false
1660516605
},
16606+
{
16607+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-troubleshoot-artifact-failure.md",
16608+
"redirect_url": "/azure/devtest-labs/devtest-lab-troubleshoot-apply-artifacts",
16609+
"redirect_document_id": false
16610+
},
1660616611
{
1660716612
"source_path_from_root": "/articles/dns/dns-getstarted-cli-nodejs.md",
1660816613
"redirect_url": "/azure/dns/dns-getstarted-cli",
@@ -19838,6 +19843,36 @@
1983819843
"redirect_url": "/azure/machine-learning/concept-event-grid-integration",
1983919844
"redirect_document_id": true
1984019845
},
19846+
{
19847+
"source_path_from_root": "/articles/event-grid/cli-samples.md",
19848+
"redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
19849+
"redirect_document_id": true
19850+
},
19851+
{
19852+
"source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-azure-subscription.md",
19853+
"redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
19854+
"redirect_document_id": false
19855+
},
19856+
{
19857+
"source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-create-custom-topic.md",
19858+
"redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
19859+
"redirect_document_id": false
19860+
},
19861+
{
19862+
"source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-resource-group-filter.md",
19863+
"redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
19864+
"redirect_document_id": false
19865+
},
19866+
{
19867+
"source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-blob.md",
19868+
"redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
19869+
"redirect_document_id": false
19870+
},
19871+
{
19872+
"source_path_from_root": "/articles/event-grid/scripts/event-grid-cli-resource-group.md",
19873+
"redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
19874+
"redirect_document_id": false
19875+
},
1984119876
{
1984219877
"source_path_from_root": "/articles/machine-learning/service/concept-ml-pipelines.md",
1984319878
"redirect_url": "/azure/machine-learning/concept-ml-pipelines",
@@ -21193,11 +21228,6 @@
2119321228
"redirect_url": "/azure/machine-learning/tutorial-train-models-with-aml",
2119421229
"redirect_document_id": true
2119521230
},
21196-
{
21197-
"source_path_from_root": "/articles/machine-learning/service/reference-pipeline-yaml.md",
21198-
"redirect_url": "/azure/machine-learning/reference-yaml-job-pipeline",
21199-
"redirect_document_id": false
21200-
},
2120121231
{
2120221232
"source_path_from_root": "/articles/machine-learning/tutorial-pipeline-batch-scoring-classification.md",
2120321233
"redirect_url": "/azure/machine-learning/tutorial-pipeline-python-sdk",
@@ -27773,6 +27803,11 @@
2777327803
"redirect_url": "/azure/storsimple/storsimple-virtual-array-update-06-release-notes",
2777427804
"redirect_document_id": false
2777527805
},
27806+
{
27807+
"source_path_from_root": "/articles/private-5g-core/activate-sims.md",
27808+
"redirect_url": "/azure/private-5g-core/provision-sims-azure-portal",
27809+
"redirect_document_id": false
27810+
},
2777627811
{
2777727812
"source_path_from_root": "/articles/azure-resource-manager/resource-manager-template-lock.md",
2777827813
"redirect_url": "/azure/templates/microsoft.authorization/locks",

0 commit comments

Comments
 (0)