Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Merge master into api #389

Merged
merged 3 commits into from
Feb 20, 2015
Merged

Merge master into api #389

merged 3 commits into from
Feb 20, 2015

Conversation

crosbymichael
Copy link
Contributor

No description provided.

coolljt0725 and others added 3 commits February 13, 2015 14:33
…u_cfs_quota

Add systemd support cpu.cfs_quota_us and cpu.cfs_period_us
Signed-off-by: Michael Crosby <[email protected]>

Conflicts:
	cgroups/systemd/apply_systemd.go
@vmarmol
Copy link
Contributor

vmarmol commented Feb 20, 2015

LGTM

vmarmol added a commit that referenced this pull request Feb 20, 2015
@vmarmol vmarmol merged commit 7eceabd into docker-archive:api Feb 20, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants