Skip to content

Commit cbd3706

Browse files
Resolve conflict.
2 parents 9aeb3dd + ec72f6e commit cbd3706

File tree

1,807 files changed

+12860
-8196
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,807 files changed

+12860
-8196
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,6 @@
12891289
".openpublishing.redirection.azure-databricks.json",
12901290
".openpublishing.redirection.azure-datalake-storage-gen1.json",
12911291
".openpublishing.redirection.azure-hpc.json",
1292-
".openpublishing.redirection.azure-kubernetes-service.json",
12931292
".openpublishing.redirection.azure-monitor.json",
12941293
".openpublishing.redirection.azure-percept.json",
12951294
".openpublishing.redirection.azure-productivity.json",
@@ -1337,7 +1336,6 @@
13371336
"articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
13381337
"articles/ai-services.openpublishing.redirection.ai-services.json",
13391338
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
1340-
"articles/aks/.openpublishing.redirection.aks.json",
13411339
"articles/analysis-services/.openpublishing.redirection.analysis-services.json",
13421340
"articles/application-gateway/.openpublishing.redirection.application-gateway.json",
13431341
"articles/automation/.openpublishing.redirection.automation.json",

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

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

.openpublishing.redirection.container-registry.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@
165165
"source_path": "articles/container-registry/monitor-service-reference.md",
166166
"redirect_url": "/azure/container-registry/monitor-container-registry-reference",
167167
"redirect_document_id": true
168+
},
169+
{
170+
"source_path_from_root": "/articles/container-registry/container-registry-auth-aks.md",
171+
"redirect_url": "/azure/aks/cluster-container-registry-integration",
172+
"redirect_document_id": false
173+
},
174+
{
175+
"source_path_from_root": "/articles/container-service/kubernetes/container-service-kubernetes-jenkins.md",
176+
"redirect_url": "/azure/aks/jenkins-continuous-deployment",
177+
"redirect_document_id": false
168178
}
169179
]
170180
}

0 commit comments

Comments
 (0)