Merge pull request #29569 from allencloud/update-docs-about-oom-score-adj

update docs about  --oom-score-adj
(cherry picked from commit 0d93970c52)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2016-12-20 13:18:57 +01:00 committed by Sebastiaan van Stijn
parent 199cd1e36e
commit 23c03e1146
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C

View file

@ -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