Skip to content

Commit 48f1315

Browse files
committed
Sync release-ash-2501 with main, fix merge
2 parents 5c710b9 + a0a2b4f commit 48f1315

File tree

1,869 files changed

+13916
-11088
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,869 files changed

+13916
-11088
lines changed

.openpublishing.publish.config.json

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"locale": "en-us",
2323
"monikers": [],
2424
"moniker_ranges": [],
25-
"open_to_public_contributors": false,
25+
"open_to_public_contributors": true,
2626
"type_mapping": {
2727
"Conceptual": "Content"
2828
},
@@ -105,12 +105,6 @@
105105
"branch": "main",
106106
"branch_mapping": {}
107107
},
108-
{
109-
"path_to_root": "azure-reference-other-repo",
110-
"url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
111-
"branch": "main",
112-
"branch_mapping": {}
113-
},
114108
{
115109
"path_to_root": "quickstart-templates",
116110
"url": "https://github.com/Azure/azure-quickstart-templates",
@@ -141,6 +135,7 @@
141135
".openpublishing.redirection.json",
142136
".openpublishing.redirection.pep.json",
143137
".openpublishing.redirection.aks.json",
144-
".openpublishing.redirection.aks-edge.json"
138+
".openpublishing.redirection.aks-edge.json",
139+
".openpublishing.redirection.azure-local.json"
145140
]
146141
}

.openpublishing.redirection.aks.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,21 @@
14051405
"redirect_url": "/azure/aks/hybrid/concepts-security",
14061406
"redirect_document_id": false
14071407
},
1408+
{
1409+
"source_path": "AKS-Hybrid/webhook-denied-request.md",
1410+
"redirect_url": "/azure/aks/hybrid/troubleshoot-overview",
1411+
"redirect_document_id": false
1412+
},
1413+
{
1414+
"source_path": "AKS-Hybrid/create-storage-classes.md",
1415+
"redirect_url": "/azure/aks/hybrid/overview",
1416+
"redirect_document_id": false
1417+
},
1418+
{
1419+
"source_path": "AKS-Hybrid/storage-class-overview.md",
1420+
"redirect_url": "/azure/aks/hybrid/overview",
1421+
"redirect_document_id": false
1422+
},
14081423
{
14091424
"source_path": "AKS-Hybrid/infrastructure-components.md",
14101425
"redirect_url": "/azure/aks/hybrid/cluster-architecture",

0 commit comments

Comments
 (0)