Skip to content

[release/1.0] BACKPORT: server: only warn on failed OOM score adjust#1909

Merged
stevvooe merged 1 commit intocontainerd:release/1.0from
estesp:backport-oom-warn-only
Dec 12, 2017
Merged

[release/1.0] BACKPORT: server: only warn on failed OOM score adjust#1909
stevvooe merged 1 commit intocontainerd:release/1.0from
estesp:backport-oom-warn-only

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Dec 12, 2017

Signed-off-by: Stephen J Day [email protected]

Original PR: #1906

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

1 similar comment
@stevvooe
Copy link
Copy Markdown
Member

LGTM

@stevvooe
Copy link
Copy Markdown
Member

@estesp As a part of this proces, I think you need to reference the original PR in the description of the issue. This way the cherry-pick marked PR (the original PR), has a link to the PR with the actual cherry-pick.

@estesp
Copy link
Copy Markdown
Member Author

estesp commented Dec 12, 2017

@stevvooe added ref; thanks

@stevvooe stevvooe added this to the 1.0.1 milestone Dec 12, 2017
@stevvooe stevvooe merged commit 2689c98 into containerd:release/1.0 Dec 12, 2017
@estesp estesp deleted the backport-oom-warn-only branch December 12, 2017 19:10
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