Skip to content

Commit 12728fa

Browse files
b-ahibbardb-ahibbard
committed
resolve merge conflict
2 parents cb6fb01 + fdb9cff commit 12728fa

File tree

5,252 files changed

+86273
-56168
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,252 files changed

+86273
-56168
lines changed

‎.openpublishing.publish.config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,12 @@
356356
"branch": "main",
357357
"branch_mapping": {}
358358
},
359+
{
360+
"path_to_root": "azure-functions-python-worker",
361+
"url": "https://github.com/Azure/azure-functions-python-worker",
362+
"branch": "dev",
363+
"branch_mapping": {}
364+
},
359365
{
360366
"path_to_root": "functions-openapi-turbine-repair",
361367
"url": "https://github.com/Azure-Samples/functions-openapi-turbine-repair",
@@ -866,6 +872,12 @@
866872
"branch": "master",
867873
"branch_mapping": {}
868874
},
875+
{
876+
"path_to_root": "blob-devguide-go",
877+
"url": "https://github.com/Azure-Samples/blob-storage-devguide-go",
878+
"branch": "main",
879+
"branch_mapping": {}
880+
},
869881
{
870882
"path_to_root": "azure-sdk-for-net",
871883
"url": "https://github.com/Azure/azure-sdk-for-net/",

‎.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,12 +351,6 @@
351351
"redirect_url": "/cli/azure/aks#az_aks_create",
352352
"redirect_document_id": false
353353
},
354-
{
355-
"source_path_from_root": "/articles/aks/delete-cluster.md",
356-
"redirect_url": "/cli/azure/aks#az_aks_delete",
357-
"redirect_document_id": false
358-
},
359-
360354
{
361355
"source_path": "articles/aks/view-master-logs.md",
362356
"redirect_url": "/azure/aks/view-control-plane-logs",

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/azure-monitor/agents/om-agents.md",
10+
"redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
1015
"redirect_url": "/azure/azure-monitor/getting-started",

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

Lines changed: 7 additions & 2 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-cloud/secret-scanning.md",
5+
"redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-cloud/prevent-misconfigurations.md",
510
"redirect_url": "/azure/defender-for-cloud/manage-mcsb",
@@ -711,7 +716,7 @@
711716
"redirect_document_id": true
712717
},
713718
{
714-
"source_path_from_root": "/articles/security-center/update-regulatory-compliance-packages.md",
719+
"source_path_from_root": "/articles/security-center/update-regulatory-compliance-packages.yml",
715720
"redirect_url": "/azure/defender-for-cloud/update-regulatory-compliance-packages",
716721
"redirect_document_id": true
717722
},
@@ -721,7 +726,7 @@
721726
"redirect_document_id": true
722727
},
723728
{
724-
"source_path_from_root": "/articles/security-center/workflow-automation.md",
729+
"source_path_from_root": "/articles/security-center/workflow-automation.yml",
725730
"redirect_url": "/azure/defender-for-cloud/workflow-automation",
726731
"redirect_document_id": true
727732
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@
760760
"redirect_document_id": false
761761
},
762762
{
763-
"source_path_from_root": "/articles/defender-for-iot/how-to-deploy-edge.md",
763+
"source_path_from_root": "/articles/defender-for-iot/how-to-deploy-edge.yml",
764764
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-deploy-edge",
765765
"redirect_document_id": false
766766
},

‎.openpublishing.redirection.json

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/blobs/blob-v11-samples-dotnet.md",
5+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v11-samples-dotnet",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/storage/blobs/blob-v11-samples-javascript.md",
10+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v11-samples-javascript",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/storage/blobs/blob-v2-samples-python.md",
15+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v2-samples-python",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/storage/common/geo-redundant-design-legacy.md",
20+
"redirect_url": "/previous-versions/azure/storage/common/geo-redundant-design-legacy",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/germany/index.yml",
25+
"redirect_url": "/previous-versions/azure/germany/index",
26+
"redirect_document_id": false
27+
},
328
{
429
"source_path_from_root": "/articles/internet-analyzer/internet-analyzer-cli.md",
530
"redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-cli",
@@ -3405,6 +3430,12 @@
34053430
"redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
34063431
"redirect_document_id": false
34073432
},
3433+
{
3434+
"source_path_from_root": "/articles/ai-studio/how-to/model-catalog.md",
3435+
"redirect_url": "/azure/ai-studio/how-to/model-catalog-overview",
3436+
"redirect_document_id": false
3437+
},
3438+
34083439
{
34093440
"source_path_from_root": "/articles/service-fabric/upgrade-managed-disks.md",
34103441
"redirect_url": "/azure/service-fabric/service-fabric-scale-up-primary-node-type",
@@ -3987,18 +4018,23 @@
39874018
},
39884019
{
39894020
"source_path_from_root":"/articles/trusted-signing/concept.md",
3990-
"redirect_url":"/azure/trusted-signing/concept-trustedsigning-resources-roles",
4021+
"redirect_url":"/azure/trusted-signing/concept-trusted-signing-resources-roles",
39914022
"redirect_document_id":false
39924023
},
39934024
{
39944025
"source_path_from_root":"/articles/container-instances/availability-zones.md",
39954026
"redirect_url":"/azure/reliability/reliability-containers",
39964027
"redirect_document_id":false
39974028
},
3998-
{
3999-
"source_path_from_root":"/articles/service-connector/quickstart-cli-aks-connection.md",
4000-
"redirect_url":"/azure/service-connector/quickstart-portal-aks-connection",
4001-
"redirect_document_id":false
4002-
}
4029+
{
4030+
"source_path_from_root":"/articles/aks/generation-2-vm-windows.md",
4031+
"redirect_url":"/azure/aks/generation-2-vm",
4032+
"redirect_document_id":false
4033+
},
4034+
{
4035+
"source_path_from_root":"/articles/cosmos-db/high-availability.md",
4036+
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql.md",
4037+
"redirect_document_id":false
4038+
}
40034039
]
40044040
}

‎.openpublishing.redirection.operator-5g-core.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"redirect_document_id": false
1717
},
1818
{
19-
"source_path_from_root": "/articles/operator-5g-core/how-to-complete-prerequisites-deploy-azure-kubernetes-service.md",
20-
"redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service",
19+
"source_path_from_root": "/articles/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service.md",
20+
"redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-nexus-azure-kubernetes-service",
2121
"redirect_document_id": false
2222
},
2323
{
@@ -49,6 +49,11 @@
4949
"source_path_from_root": "/articles/operator-5g-core/quickstart-perform-checks-post-deployment.md",
5050
"redirect_url": "/azure/operator-5g-core/quickstart-configure-extension-for-status-monitoring",
5151
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/operator-5g-core/how-to-complete-prerequisites-deploy-azure-kubernetes-service.md",
55+
"redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service",
56+
"redirect_document_id": false
5257
}
5358
]
5459
}

0 commit comments

Comments
 (0)