summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2015-11-24 18:12:53 +0300
committerMichael Klishin <mklishin@pivotal.io>2015-11-24 18:12:53 +0300
commite07be9a0f52a1c09f6928cb06c27c47f1f3af2bf (patch)
treefdcabd8872f76cf0057f82ed01fed9514b8b0f02 /docs
parent5d45ac7664f82261d9479551e0affe657ede1977 (diff)
downloadrabbitmq-server-git-e07be9a0f52a1c09f6928cb06c27c47f1f3af2bf.tar.gz
Switch absolute memory watermark values to be in bytes
Fixes #407, references #207, #378, #448.
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmq.config.example4
-rw-r--r--docs/rabbitmqctl.1.xml6
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index fa73960cbe..a8e5016524 100644
--- a/docs/rabbitmq.config.example
+++ b/docs/rabbitmq.config.example
@@ -182,9 +182,9 @@
%%
%% {vm_memory_high_watermark, 0.4},
- %% Alternatively, we can set a limit (in megabytes) of RAM used by the node.
+ %% Alternatively, we can set a limit (in bytes) of RAM used by the node.
%%
- %% {vm_memory_high_watermark, {absolute, 1024}},
+ %% {vm_memory_high_watermark, {absolute, 1073741824}},
%% Fraction of the high watermark limit at which queues start to
%% page message out to disc in order to free up memory.
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index f138ecff6c..508cc7a585 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -1954,14 +1954,14 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><cmdsynopsis><command>set_vm_memory_high_watermark absolute</command> <arg choice="req"><replaceable>memory_limit_mb</replaceable></arg></cmdsynopsis></term>
+ <term><cmdsynopsis><command>set_vm_memory_high_watermark absolute</command> <arg choice="req"><replaceable>memory_limit_in_bytes</replaceable></arg></cmdsynopsis></term>
<listitem>
<variablelist>
<varlistentry>
- <term>memory_limit_mb</term>
+ <term>memory_limit_in_bytes</term>
<listitem><para>
The new memory limit at which flow control is
- triggered, expressed in MB as an integer number
+ triggered, expressed in bytes as an integer number
greater than or equal to 0.
</para></listitem>
</varlistentry>