From 23c03e1146420b09636a49b00e42c72233b5bd1e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 20 Dec 2016 13:18:57 +0100 Subject: [PATCH] Merge pull request #29569 from allencloud/update-docs-about-oom-score-adj update docs about --oom-score-adj (cherry picked from commit 0d93970c527b7bbe970655ada658f3c7466d015a) Signed-off-by: Sebastiaan van Stijn --- docs/reference/run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/run.md b/docs/reference/run.md index 73769ed610..e0b233752f 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -836,7 +836,7 @@ The container has unlimited memory which can cause the host to run out memory and require killing system processes to free memory. The `--oom-score-adj` parameter can be changed to select the priority of which containers will be killed when the system is out of memory, with negative scores making them -less likely to be killed an positive more likely. +less likely to be killed, and positive scores more likely. ### Kernel memory constraints