1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #1881 from docker/revert-1868-fix-error-in-restore-ep

Revert "Fixes bug that mistook gw6 for gw."
This commit is contained in:
Madhu Venugopal 2017-08-02 09:16:03 -07:00 committed by GitHub
commit de45a92ed5

View file

@ -413,7 +413,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))