summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2016-01-04 14:52:23 -0800
committerJoffrey F <f.joffrey@gmail.com>2016-01-04 14:52:23 -0800
commitee0788e4ad07349bb2856a0f1bb40b3e9501d622 (patch)
tree2a1e0faad98233f7ea71fd8567026135310d9983
parent57512760c83fbe41302891aa51e34a86f4db74de (diff)
parent7724e36e1bd578b1a90521d148aac0bab113d332 (diff)
downloaddocker-py-ee0788e4ad07349bb2856a0f1bb40b3e9501d622.tar.gz
Merge pull request #882 from docker/881-hostconfig_doc
Add cpu_quota and cpu_period to the HostConfig documentation
-rw-r--r--docs/hostconfig.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/hostconfig.md b/docs/hostconfig.md
index 0da47ac..6b11798 100644
--- a/docs/hostconfig.md
+++ b/docs/hostconfig.md
@@ -103,6 +103,8 @@ for example:
allowed to consume.
* mem_swappiness (int): Tune a container's memory swappiness behavior.
Accepts number between 0 and 100.
+* cpu_group (int): The length of a CPU period in microseconds.
+* cpu_period (int): Microseconds of CPU time that the container can get in a CPU period.
* group_add (list): List of additional group names and/or IDs that the
container process will run as.
* devices (list): A list of devices to add to the container specified as dicts