Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix oom tests on non Linux #5245

Merged
merged 1 commit into from
Mar 23, 2021
Merged

Fix oom tests on non Linux #5245

merged 1 commit into from
Mar 23, 2021

Conversation

mxpv
Copy link
Member

@mxpv mxpv commented Mar 23, 2021

OOM procfs is linux specific, so should not be running on mac os, freebsd, etc.

Signed-off-by: Maksym Pavlenko pavlenko.maksym@gmail.com

@mxpv mxpv requested a review from samuelkarp March 23, 2021 00:52
Copy link
Member

@dims dims left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83
Copy link
Member

Needs rebase.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
@mxpv
Copy link
Member Author

mxpv commented Mar 23, 2021

Rebased

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

@mxpv mxpv merged commit 792336b into containerd:master Mar 23, 2021
@mxpv mxpv deleted the oom branch March 23, 2021 19:34
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.

None yet

5 participants