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

quota: add build tag to disable it #375

Merged
merged 1 commit into from
Jun 27, 2019

Conversation

giuseppe
Copy link
Member

change backported from Moby.

Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com

@rhatdan
Copy link
Member

rhatdan commented Jun 25, 2019

LGTM

@giuseppe
Copy link
Member Author

the CI failure doesn't seem related to the PR

@giuseppe giuseppe requested a review from vrothberg June 26, 2019 13:15
@giuseppe
Copy link
Member Author

@nalind PTAL

@nalind
Copy link
Member

nalind commented Jun 26, 2019

Looks reasonable. If we're not going to export the newly-added error for direct comparison (it would have to be moved to a place where it's unconditionally declared), then it might as well be allocated at the sites where it's being returned, so that a backtrace ends at the right place. It's okay to merge in its current form, though.

change backported from Moby.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe
Copy link
Member Author

Looks reasonable. If we're not going to export the newly-added error for direct comparison (it would have to be moved to a place where it's unconditionally declared), then it might as well be allocated at the sites where it's being returned, so that a backtrace ends at the right place. It's okay to merge in its current form, though.

thanks, I've updated the PR and now the error is allocated where it is returned

@giuseppe giuseppe changed the title quota: add build tag to disable it [WIP] quota: add build tag to disable it Jun 27, 2019
@giuseppe giuseppe changed the title [WIP] quota: add build tag to disable it quota: add build tag to disable it Jun 27, 2019
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM

@vrothberg
Copy link
Member

Restarted the flaked job. Good to merge once we're green :-)

@vrothberg vrothberg merged commit 8eed0c3 into containers:master Jun 27, 2019
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