Merge pull request #1880 from docker/revert-1875-restore_17.06

mavenugo · web-flow · commit f0b9939b255a · 2017-08-01T17:18:47.000-07:00
Revert "[backport 17.06] Fixes bug that mistook gw6 for gw."
diff --git a/endpoint_info.go b/endpoint_info.go
@@ -415,7 +415,7 @@ func (epj *endpointJoinInfo) UnmarshalJSON(b []byte) error {
 		return err
 	}
 	if v, ok := epMap["gw"]; ok {
-		epj.gw = net.ParseIP(v.(string))
+		epj.gw6 = net.ParseIP(v.(string))
 	}
 	if v, ok := epMap["gw6"]; ok {
 		epj.gw6 = net.ParseIP(v.(string))

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ func (epj *endpointJoinInfo) UnmarshalJSON(b []byte) error {`
`415`	`415`	`return err`
`416`	`416`	`}`
`417`	`417`	`if v, ok := epMap["gw"]; ok {`
`418`		`- epj.gw = net.ParseIP(v.(string))`
	`418`	`+ epj.gw6 = net.ParseIP(v.(string))`
`419`	`419`	`}`
`420`	`420`	`if v, ok := epMap["gw6"]; ok {`
`421`	`421`	`epj.gw6 = net.ParseIP(v.(string))`