Skip to content

[1.13.x] Vendoring swarmkit @c7df892#31030

Merged
LK4D4 merged 1 commit intomoby:1.13.xfrom
aboch:c1.13.x-2
Feb 15, 2017
Merged

[1.13.x] Vendoring swarmkit @c7df892#31030
LK4D4 merged 1 commit intomoby:1.13.xfrom
aboch:c1.13.x-2

Conversation

@aboch
Copy link
Contributor

@aboch aboch commented Feb 15, 2017 •
edited
Loading

Brings the fixes for #28291, #25608 and #30938, #31100 to the 1.13.x branch

@aboch aboch added this to the 1.13.2 milestone Feb 15, 2017
cpuguy83
cpuguy83 approved these changes Feb 15, 2017
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@yongtang
Copy link
Member

yongtang commented Feb 15, 2017

The Jenkins failure on windowsRS1 seems to be the same as #31011. Not sure about the reason of the Windows failure though I think it is unrelated to the update of this PR.

@LK4D4
Copy link
Contributor

LK4D4 commented Feb 15, 2017

I think failure might be valid, but unrelated to change:

05:40:53 ----------------------------------------------------------------------
05:40:53 FAIL: docker_cli_logs_test.go:310: DockerSuite.TestLogsCLIContainerNotFound
05:40:53 
05:40:53 docker_cli_logs_test.go:314:
05:40:53     c.Assert(out, checker.Equals, message)
05:40:53 ... obtained string = "Error response from daemon: No such container: testlogsnocontainer\n"
05:40:53 ... expected string = "Error: No such container: testlogsnocontainer\n"
05:40:53 
05:40:57 
05:40:57 ----------------------------------------------------------------------

random ping of @vdemeester

LK4D4
LK4D4 approved these changes Feb 15, 2017
View reviewed changes
Copy link
Contributor

@LK4D4 LK4D4 left a comment

Choose a reason for hiding this comment

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

LGTM

@LK4D4 LK4D4 merged commit b3b30b0 into moby:1.13.x Feb 15, 2017
@yongtang yongtang mentioned this pull request Feb 16, 2017
Merged
@thaJeztah thaJeztah mentioned this pull request Feb 21, 2017
Closed
@aboch aboch deleted the c1.13.x-2 branch November 8, 2017 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

+1 more reviewer

@LK4D4 LK4D4 LK4D4 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

17.03.0

Development

Successfully merging this pull request may close these issues.

6 participants

@aboch @yongtang @LK4D4 @cpuguy83 @thaJeztah @GordonTheTurtle