Browse code

Fix docs for oom-kill-disable

Addresses: #14440

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>

Qiang Huang authored on 2015/07/08 10:51:10
Showing 1 changed files
... ...
@@ -590,7 +590,7 @@ would be 2*300M, so processes can use 300M swap memory as well.
590 590
 We set both memory and swap memory, so the processes in the container can use
591 591
 300M memory and 700M swap memory.
592 592
 
593
-By default, Docker kills processes in a container if an out-of-memory (OOM)
593
+By default, kernel kills processes in a container if an out-of-memory (OOM)
594 594
 error occurs. To change this behaviour, use the `--oom-kill-disable` option.
595 595
 Only disable the OOM killer on containers where you have also set the
596 596
 `-m/--memory` option. If the `-m` flag is not set, this can result in the host