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

[docker_daemon] custom cgroups are per instance only. YAML updates. #2846

Merged
merged 2 commits into from Sep 15, 2016

Conversation

truthbk
Copy link
Member

@truthbk truthbk commented Sep 14, 2016

What does this PR do?

We used to have custom_cgroups be a setting that would apply both at the init_conf and instance levels. This PR makes it only apply per instance. It also updates the documentation.

Motivation

It's confusing to have it configurable on both levels. Also, there was a small bug. So let's just do this instead.

@truthbk truthbk added the bugfix label Sep 14, 2016
@truthbk truthbk added this to the 5.9.0 milestone Sep 14, 2016
Copy link
Member

@hkaj hkaj left a comment

Choose a reason for hiding this comment

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

Makes sense 👍

@truthbk truthbk merged commit 74a33cf into master Sep 15, 2016
@truthbk truthbk deleted the jaime/docker_fixyaml branch September 15, 2016 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants