Skip to content

Fix bug in link-local unmarshalling#1564

Merged
mavenugo merged 1 commit into
moby:masterfrom
aboch:ll
Nov 21, 2016
Merged

Fix bug in link-local unmarshalling#1564
mavenugo merged 1 commit into
moby:masterfrom
aboch:ll

Conversation

@aboch
Copy link
Copy Markdown
Contributor

@aboch aboch commented Nov 21, 2016

Related to moby/moby#28606

Signed-off-by: Alessandro Boch aboch@docker.com

@mavenugo
Copy link
Copy Markdown
Contributor

LGTM.

am surprised that this day-1 issue was not caught till now. Better late than never.

Comment thread endpoint_info.go Outdated
ll, err := types.ParseCIDR(llS)
ll, err := types.ParseCIDR(llS.(string))
if err != nil {
return types.InternalErrorf("failed to decode endpoint interface link-local address (%s) after json unmarshal: %v", llS, err)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also fix here ?

Signed-off-by: Alessandro Boch <aboch@docker.com>
@dongluochen
Copy link
Copy Markdown
Contributor

lgtm

@mavenugo
Copy link
Copy Markdown
Contributor

CI is timing out and is not related to this PR. merging

@mavenugo mavenugo merged commit dd0ddde into moby:master Nov 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants