Skip to content

Commit 52a5dd6

Browse files
aahillaahill
committed
fixing merge conflict
2 parents bcbe101 + 1d561f3 commit 52a5dd6

File tree

7,983 files changed

+83025
-50334
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,983 files changed

+83025
-50334
lines changed

‎.openpublishing.publish.config.json

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,12 @@
164164
"branch": "dev",
165165
"branch_mapping": {}
166166
},
167+
{
168+
"path_to_root": "functions-quickstart-templates-v1",
169+
"url": "https://github.com/Azure/azure-functions-templates",
170+
"branch": "v1.x",
171+
"branch_mapping": {}
172+
},
167173
{
168174
"path_to_root": "azure-functions-samples-java",
169175
"url": "https://github.com/Azure-Samples/azure-functions-samples-java",
@@ -849,9 +855,15 @@
849855
"branch_mapping": {}
850856
},
851857
{
852-
"path_to_root": "azure-cosmos-dotnet-v3",
853-
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
854-
"branch": "v3",
858+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
859+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
860+
"branch": "main",
861+
"branch_mapping": {}
862+
},
863+
{
864+
"path_to_root": "cosmos-db-nosql-python-samples",
865+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
866+
"branch": "main",
855867
"branch_mapping": {}
856868
},
857869
{
@@ -871,6 +883,12 @@
871883
"url": "https://github.com/MicrosoftDocs/reusable-content",
872884
"branch": "main",
873885
"branch_mapping": {}
886+
},
887+
{
888+
"path_to_root": "azure-cosmos-db-mongodb-python-getting-started",
889+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
890+
"branch": "main",
891+
"branch_mapping": {}
874892
}
875893
],
876894
"branch_target_mapping": {
@@ -952,6 +970,7 @@
952970
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
953971
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
954972
".openpublishing.redirection.baremetal-infrastructure.json",
955-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
973+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
974+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json"
956975
]
957976
}

‎.openpublishing.redirection.active-directory.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
50+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
51+
"redirect_document_id": false
52+
},
4853
{
4954
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
5055
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
@@ -10948,7 +10953,7 @@
1094810953
},
1094910954
{
1095010955
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10951-
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10956+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-users-profile-azure-portal",
1095210957
"redirect_document_id": false
1095310958
},
1095410959
{

‎.openpublishing.redirection.azure-hpc.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/high-performance-compute/index.yml",
5+
"redirect_url": "/articles/high-performance-computing",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5516,6 +5516,11 @@
55165516
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
55175517
"redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
55185518
"redirect_document_id": false
5519+
},
5520+
{
5521+
"source_path_from_root": "/articles/azure-monitor/app/powershell-azure-diagnostics.md",
5522+
"redirect_url": "/azure/azure-monitor/agents/diagnostics-extension-to-application-insights",
5523+
"redirect_document_id": false
55195524
}
55205525
]
55215526
}

‎.openpublishing.redirection.azure-productivity.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
3030
"redirect_url": "/azure/devtest-labs/samples-powershell",
3131
"redirect_document_id": false
32-
}
32+
},
33+
{
34+
"source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
35+
"redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
36+
"redirect_document_id": false
37+
}
3338
]
3439
}

‎.openpublishing.redirection.communication-services.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-getting-started-eiot-sensor.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-frequently-asked-questions.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/faqs-general",

0 commit comments

Comments
 (0)