diff options
| author | Joffrey F <joffrey@docker.com> | 2015-11-18 14:48:55 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-11-18 14:48:55 -0800 |
| commit | e1eefce7f9152f33ae7c49a6d7c028ef5eacfb57 (patch) | |
| tree | a1480824509736ac42b53a7c605d29327ff22f63 /docs | |
| parent | 9ed721957ad42680b69141f89024e19245f1305b (diff) | |
| parent | 64eac0b71ce42b94e69f6968f664c4f8bb8454bf (diff) | |
| download | docker-py-e1eefce7f9152f33ae7c49a6d7c028ef5eacfb57.tar.gz | |
Merge branch 'schu-oom-kill-disable-pr'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hostconfig.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/hostconfig.md b/docs/hostconfig.md index 40accce..6b28be6 100644 --- a/docs/hostconfig.md +++ b/docs/hostconfig.md @@ -72,6 +72,7 @@ for example: * port_bindings (dict): Port bindings. See [Port bindings](port-bindings.md) for more information. * lxc_conf (dict): LXC config +* oom_kill_disable (bool): Whether to disable OOM killer * publish_all_ports (bool): Whether to publish all ports to the host * links (dict or list of tuples): either as a dictionary mapping name to alias or as a list of `(name, alias)` tuples |