fix merge error: azure storage classes yaml

wenwu449 · wenwu449 · commit 004145cba163 · 2017-12-12T18:03:36.000-08:00
diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -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{

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ var kubernetesAritfacts15 = map[string]string{`
`121`	`121`	`var kubernetesAddonYamls = map[string]string{`
`122`	`122`	`"MASTER_ADDON_KUBE_DNS_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kube-dns-deployment.yaml",`
`123`	`123`	`"MASTER_ADDON_KUBE_PROXY_DAEMONSET_B64_GZIP_STR": "kubernetesmasteraddons-kube-proxy-daemonset.yaml",`
`124`		`- "MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-tiller-deployment.yaml",`
	`124`	`+ "MASTER_ADDON_AZURE_STORAGE_CLASSES_B64_GZIP_STR": "kubernetesmasteraddons-azure-storage-classes.yaml",`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`var kubernetesAddonYamls15 = map[string]string{`