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

update docs about  --oom-score-adj
This commit is contained in:
Sebastiaan van Stijn 2016-12-20 13:18:57 +01:00 committed by GitHub
commit 0d93970c52
1 changed files with 1 additions and 1 deletions

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