Merge pull request #14098 from danwinship/fix-sdn-note

OpenShift Bot · web-flow · commit 9063c2c011de · 2017-05-09T11:08:39.000-05:00
Merged by openshift-bot
diff --git a/pkg/sdn/plugin/ovscontroller.go b/pkg/sdn/plugin/ovscontroller.go
@@ -37,7 +37,7 @@ func (oc *ovsController) getVersionNote() string {
 	if VERSION > 254 {
 		panic("Version too large!")
 	}
-	return fmt.Sprintf("note:%02X.%02X", VERSION, oc.pluginId)
+	return fmt.Sprintf("note:%02X.%02X", oc.pluginId, VERSION)
 }
 
 func (oc *ovsController) AlreadySetUp() bool {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (oc *ovsController) getVersionNote() string {`
`37`	`37`	`if VERSION > 254 {`
`38`	`38`	`panic("Version too large!")`
`39`	`39`	`}`
`40`		`- return fmt.Sprintf("note:%02X.%02X", VERSION, oc.pluginId)`
	`40`	`+ return fmt.Sprintf("note:%02X.%02X", oc.pluginId, VERSION)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func (oc *ovsController) AlreadySetUp() bool {`