close
Skip to content

Vendor in containerd#26874

Merged
vieux merged 1 commit into
moby:1.12.xfrom
mlaventure:1.12.2-vendor-containerd
Sep 26, 2016
Merged

Vendor in containerd#26874
vieux merged 1 commit into
moby:1.12.xfrom
mlaventure:1.12.2-vendor-containerd

Conversation

@mlaventure

@mlaventure mlaventure commented Sep 23, 2016

Copy link
Copy Markdown
Contributor

This brings in the exec's children handling fixes

Signed-off-by: Kenfe-Mickael Laventure mickael.laventure@gmail.com

This version just test if nothing gets broken as I had to skip a few commits (and revert one) when generating the new containerd.

@mlaventure mlaventure force-pushed the 1.12.2-vendor-containerd branch from e039575 to a5a0999 Compare September 23, 2016 21:17
@vieux vieux self-assigned this Sep 23, 2016
@vieux vieux added this to the 1.12.2 milestone Sep 23, 2016
@tonistiigi

tonistiigi commented Sep 23, 2016

Copy link
Copy Markdown
Member

Can't we make a tag for this is upstream? This will stop working as soon as you delete that branch on your fork.
nvm: missed that you were testing

@mlaventure

Copy link
Copy Markdown
Contributor Author

That's the plan, I'll tag it after I've merged it.

On Fri, Sep 23, 2016, 4:50 PM Tõnis Tiigi notifications@github.com wrote:

Can't we make a tag for this is upstream? This will stop working as soon
as you delete that branch on your fork.


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#26874 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/APUifi8Pcajq6xZWqZ4L4SA15GcyEeAPks5qtGXTgaJpZM4KFY-O
.

This brings in the exec's children handling fixes

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
@mlaventure mlaventure force-pushed the 1.12.2-vendor-containerd branch from e8ef7d3 to 7274021 Compare September 25, 2016 12:23
@vieux

vieux commented Sep 26, 2016

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@crosbymichael

Copy link
Copy Markdown
Contributor

LGTM

@vieux vieux merged commit 38aa258 into moby:1.12.x Sep 26, 2016
@mlaventure mlaventure deleted the 1.12.2-vendor-containerd branch October 5, 2016 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants