Skip to content

Commit 7896ff0

Browse files
cynthncynthn
committed
merging
2 parents e82dc06 + 6b9e52d commit 7896ff0

File tree

7,948 files changed

+178327
-95527
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,948 files changed

+178327
-95527
lines changed

‎.openpublishing.publish.config.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@
10071007
{
10081008
"path_to_root": "azure-actions-workflow-samples",
10091009
"url": "https://github.com/Azure/actions-workflow-samples",
1010-
"branch": "main",
1010+
"branch": "master",
10111011
"branch_mapping": {}
10121012
}
10131013
],
@@ -1086,6 +1086,7 @@
10861086
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10871087
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
10881088
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1089+
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
10891090
"articles/mariadb/.openpublishing.redirection.mariadb.json",
10901091
"articles/marketplace/.openpublishing.redirection.marketplace.json",
10911092
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -1103,6 +1104,7 @@
11031104
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
11041105
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
11051106
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1106-
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
1107+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
1108+
"articles/network-watcher/.openpublishing.redirection.network-watcher.json"
11071109
]
11081110
}

‎.openpublishing.redirection.active-directory.json

Lines changed: 399 additions & 3 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"source_path_from_root": "/articles/aks/stop-api-upgrade.md",
55
"redirect_url": "/azure/aks/upgrade-cluster",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/aks/cilium-enterprise-marketplace.md",
10+
"redirect_url": "/azure/aks/azure-cni-powered-by-cilium",
11+
"redirect_document_id": false
712
}
813
]
914
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6150,7 +6150,16 @@
61506150
"source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
61516151
"redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",
61526152
"redirect_document_id": false
6153+
},
6154+
{
6155+
"source_path_from_root": "/articles/azure-monitor/app/opentelemetry-dotnet-exporter.md",
6156+
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
6157+
"redirect_document_id": false
6158+
},
6159+
{
6160+
"source_path_from_root": "/articles/azure-monitor/logs/api/app-insights-azure-ad-api.md",
6161+
"redirect_url": "/azure/azure-monitor/app/app-insights-azure-ad-api",
6162+
"redirect_document_id": false
61536163
}
6154-
61556164
]
61566165
}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
22
"redirections": [
33
{
4-
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console.md",
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/best-practices/plan-network-monitoring.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-prepare-deploy",
6+
"redirect_document_id": false
7+
}, {
8+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console.md",
59
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-management",
610
"redirect_document_id": false
711
}, {
@@ -712,6 +716,11 @@
712716
"source_path_from_root": "/articles/defender-for-iot/organizations/references-defender-for-iot-glossary.md",
713717
"redirect_url": "/azure/defender-for-iot/organizations/overview",
714718
"redirect_document_id": false
719+
},
720+
{
721+
"source_path_from_root": "/articles/defender-for-iot/organizations/faqs-ot.md",
722+
"redirect_url": "/azure/defender-for-iot/organizations/faqs-general",
723+
"redirect_document_id": false
715724
}
716725
]
717726
}

‎.openpublishing.redirection.healthcare-apis.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -694,19 +694,27 @@
694694
"redirect_document_id": false
695695
},
696696
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-calculated-functions-mappings.md",
697-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-mappings",
697+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-templates",
698698
"redirect_document_id": false
699699
},
700700
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-calculatedcontenttemplate-mappings.md",
701-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-mappings",
701+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-templates",
702+
"redirect_document_id": false
703+
},
704+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-calculatedcontent-mappings.md",
705+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-templates",
702706
"redirect_document_id": false
703707
},
704708
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings.md",
705-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings",
709+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-templates",
706710
"redirect_document_id": false
707711
},
708712
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iotjsonpathcontenttemplate-mappings.md",
709-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings",
713+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-templates",
714+
"redirect_document_id": false
715+
},
716+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings.md",
717+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-templates",
710718
"redirect_document_id": false
711719
},
712720
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-button.md",

0 commit comments

Comments
 (0)