Skip to content

vendor: containerd/cgroups 0b889c03f102012f1d93a97ddd3ef71cd6f4f510#4550

Merged
estesp merged 1 commit intocontainerd:masterfrom
thaJeztah:bump_cgroups
Sep 10, 2020
Merged

vendor: containerd/cgroups 0b889c03f102012f1d93a97ddd3ef71cd6f4f510#4550
estesp merged 1 commit intocontainerd:masterfrom
thaJeztah:bump_cgroups

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

full diff: containerd/cgroups@318312a...0b889c0

Relevant changes:

  • v1/stats: add all fields of memory.oom_control
  • memory: remove wrong memory.kmem.limit_in_bytes check

full diff: containerd/cgroups@318312a...0b889c0

Relevant changes:

- v1/stats: add all fields of memory.oom_control
- memory: remove wrong memory.kmem.limit_in_bytes check

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

@estesp @AkihiroSuda PTAL - do we need this cherry-picked into v1.4 ?

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 10, 2020

Build succeeded.

@AkihiroSuda
Copy link
Copy Markdown
Member

Can be cherry-picked, but not necessarily IMHO

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit bc4c381 into containerd:master Sep 10, 2020
@thaJeztah thaJeztah deleted the bump_cgroups branch September 10, 2020 15:15
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.

3 participants