Skip to content

[release/1.0] Update cgroups vendor for licenses/bug fix#2198

Merged
dmcgowan merged 1 commit intocontainerd:release/1.0from
estesp:vendor-cgroups-update-1.0
Mar 9, 2018
Merged

[release/1.0] Update cgroups vendor for licenses/bug fix#2198
dmcgowan merged 1 commit intocontainerd:release/1.0from
estesp:vendor-cgroups-update-1.0

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Mar 9, 2018

Fixes a bug with OCI spec cgroup device name/paths as well as bringing
in the license header additions from the cgroups sub-project.

Signed-off-by: Phil Estes [email protected]

Fixes a bug with OCI spec cgroup device name/paths as well as bringing
in the license header additions from the cgroups sub-project.

Signed-off-by: Phil Estes <[email protected]>
Signed-off-by: Phil Estes <[email protected]>
@estesp estesp added this to the 1.0.3 milestone Mar 9, 2018
@crosbymichael
Copy link
Copy Markdown
Member

Faster than I am. My vndr is still running because of the massive k8 deps

@estesp
Copy link
Copy Markdown
Member Author

estesp commented Mar 9, 2018

Faster than I am. My vndr is still running because of the massive k8 deps

Must be the power of the Lenovo X1 Carbon over the Dell XPS 😆

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2198 into release/1.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #2198   +/-   ##
============================================
  Coverage        50.57%   50.57%           
============================================
  Files               81       81           
  Lines             7171     7171           
============================================
  Hits              3627     3627           
  Misses            2849     2849           
  Partials           695      695
Flag Coverage Δ
#linux 50.57% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9b4bbcc...5f0a37c. Read the comment docs.

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Mar 9, 2018

LGTM, but where is the PR to master?

@estesp
Copy link
Copy Markdown
Member Author

estesp commented Mar 9, 2018

@dmcgowan it's complicated; unless I temporarily have containerd master branch vendor from release/1.0 of containerd/cgroups it is hard to get the licenses and bug fix without picking up the RDMA changes which require an non-tagged/release version of the OCI runtime-spec.

Obviously that should be in place before we do a 1.1 release, but I guess it depends if we want a temporary solution for cgroups vendoring in master before that is solved.

@crosbymichael
Copy link
Copy Markdown
Member

I think we can still use this same commit in master.

@crosbymichael
Copy link
Copy Markdown
Member

I didn't update master with the cgroups change in my last PR.

@estesp
Copy link
Copy Markdown
Member Author

estesp commented Mar 9, 2018

I think we can still use this same commit in master.

That's reasonable; I will PR master with the same commit we're using for (targeting) 1.0.3 fix branch

@estesp
Copy link
Copy Markdown
Member Author

estesp commented Mar 9, 2018

#2199 handles this update for master

@dmcgowan dmcgowan merged commit c0f92dd into containerd:release/1.0 Mar 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants