The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/8120
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From c87dc5f9bb093cffad04f74369368456843285a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Thu, 5 Nov 2020 12:47:08 -0500
Subject: [PATCH] doc/instances: Rephrase limits.memory.swap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
doc/instances.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/instances.md b/doc/instances.md
index bfc2bdd497..19af14dfda 100644
--- a/doc/instances.md
+++ b/doc/instances.md
@@ -54,7 +54,7 @@ limits.kernel.\* | string | -
| no
limits.memory | string | - (all) |
yes | - | Percentage of the host's memory or
fixed value in bytes (various suffixes supported, see below)
limits.memory.enforce | string | hard |
yes | container | If hard, instance can't exceed its
memory limit. If soft, the instance can exceed its memory limit when extra host
memory is available
limits.memory.hugepages | boolean | false |
no | virtual-machine | Controls whether to back the
instance using hugepages rather than regular system memory
-limits.memory.swap | boolean | true |
yes | container | Whether to allow some of the
instance's memory to be swapped out to disk
+limits.memory.swap | boolean | true |
yes | container | Controlers whether to
encourage/discourage swapping less used pages for this instance
limits.memory.swap.priority | integer | 10 (maximum) |
yes | container | The higher this is set, the least
likely the instance is to be swapped to disk (integer between 0 and 10)
limits.network.priority | integer | 0 (minimum) |
yes | - | When under load, how much priority
to give to the instance's network requests (integer between 0 and 10)
limits.processes | integer | - (max) |
yes | container | Maximum number of processes that
can run in the instance
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
