Merge branch 'master' of github.com:CrunchyData/postgres-operator

Jeff McCormick · Jeff McCormick · commit 7289adb05dc9 · 2017-08-01T10:44:32.000-05:00
diff --git a/operator/upgrade/upgrade.go b/operator/upgrade/upgrade.go
@@ -174,7 +174,7 @@ func MajorUpgradeProcess(clientset *kubernetes.Clientset, tprclient *rest.RESTCl
 	})
 
 	if err4 != nil {
-		log.Error("erro in major upgrade " + err4.Error())
+		log.Error("error in major upgrade " + err4.Error())
 	}
 
 }
@@ -241,7 +241,7 @@ func finishUpgrade(clientset *kubernetes.Clientset, tprclient *rest.RESTClient,
 
 	err = clusterStrategy.MajorUpgradeFinalize(clientset, tprclient, &cl, &upgrade, namespace)
 	if err != nil {
-		log.Error("erro in major upgrade finalize" + err.Error())
+		log.Error("error in major upgrade finalize" + err.Error())
 	}
 
 	if err == nil {

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ func MajorUpgradeProcess(clientset kubernetes.Clientset, tprclient rest.RESTCl`
`174`	`174`	`})`
`175`	`175`
`176`	`176`	`if err4 != nil {`
`177`		`- log.Error("erro in major upgrade " + err4.Error())`
	`177`	`+ log.Error("error in major upgrade " + err4.Error())`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`}`
`@@ -241,7 +241,7 @@ func finishUpgrade(clientset kubernetes.Clientset, tprclient rest.RESTClient,`
`241`	`241`
`242`	`242`	`err = clusterStrategy.MajorUpgradeFinalize(clientset, tprclient, &cl, &upgrade, namespace)`
`243`	`243`	`if err != nil {`
`244`		`- log.Error("erro in major upgrade finalize" + err.Error())`
	`244`	`+ log.Error("error in major upgrade finalize" + err.Error())`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`if err == nil {`