Skip to content

Commit

Permalink
fix merge error: azure storage classes yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
wenwu449 committed Dec 13, 2017
1 parent adbc1cf commit 004145c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/acsengine/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ var kubernetesAritfacts15 = map[string]string{
var kubernetesAddonYamls = map[string]string{
"MASTER_ADDON_KUBE_DNS_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kube-dns-deployment.yaml",
"MASTER_ADDON_KUBE_PROXY_DAEMONSET_B64_GZIP_STR": "kubernetesmasteraddons-kube-proxy-daemonset.yaml",
"MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-tiller-deployment.yaml",
"MASTER_ADDON_AZURE_STORAGE_CLASSES_B64_GZIP_STR": "kubernetesmasteraddons-azure-storage-classes.yaml",
}

var kubernetesAddonYamls15 = map[string]string{
Expand Down

0 comments on commit 004145c

Please sign in to comment.