This repository was archived by the owner on Oct 13, 2023. It is now read-only.
forked from moby/moby
-
Notifications
You must be signed in to change notification settings - Fork 420
[19.03 backport] Integration: change signatures to fix golint warnings #281
Merged
andrewhsu
merged 8 commits into
docker-archive:19.03
from
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Merged
[19.03 backport] Integration: change signatures to fix golint warnings #281
andrewhsu
merged 8 commits into
docker-archive:19.03
from
thaJeztah:19.03_backport_fix_golint_again
Sep 23, 2019
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Author
|
Marked as WIP because #279 should be merge first (but we could merge this one instead fo get both changes in at once) |
80576fb to
788bbde
Compare
Member
Author
|
rebased, now that #279 was merged @kolyshkin @andrewhsu this is ready for review/merge |
788bbde to
f3084e6
Compare
Member
Author
|
rebased again because Jenkins logs were purged |
Member
Author
|
@kolyshkin ptal |
Member
Author
|
Hm.. might've missed a cherry-pick |
Member
Author
|
Looks like that needs moby#39357 |
Member
Author
f3084e6 to
886a355
Compare
6753a59 to
d25a178
Compare
6d0c47d to
e2411eb
Compare
3 tasks
Member
Author
|
this is now failing because this branch is broken, and will be fixed by #374 (which depends on this PR) |
This reverts commit 8f4b96f. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Line 30: warning: context.Context should be the first parameter of a function (golint) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit caec45a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
``` Line 25: warning: context.Context should be the first parameter of a function (golint) Line 44: warning: context.Context should be the first parameter of a function (golint) Line 52: warning: context.Context should be the first parameter of a function (golint) ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit b4c46b0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Line 59: warning: context.Context should be the first parameter of a function (golint) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9f9b429) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Line 30: warning: context.Context should be the first parameter of a function (golint) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 123e29f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Line 441: warning: context.Context should be the first parameter of a function (golint) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit dac5710) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit a281289) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
e2411eb to
2cc1f4c
Compare
This reverts commit 8fca769. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2cc1f4c to
0d6d5b3
Compare
andrewhsu
approved these changes
Sep 23, 2019
andrewhsu
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Built on top of #279 ("[19.03 backport] Handle the error case when a container reattaches to the same network") first two commits are from that PRbackports of:
Some conflicts in test files when backporting the first PR (moby#39332);
conflict in first commit, due to Add alias for hostname if hostname != container name moby/moby#39204 ("Add alias for hostname if hostname != container name") not being in 19.03 (thus a test missing that was being modified)
conflict in second commit, due to Start containers in their own cgroup namespaces moby/moby#38377 (Start containers in their own cgroup namespaces) feature not being in 19.03;
conflict in third commit (due to the same feature missing);
Conflicts were not too difficult to resolve