summaryrefslogtreecommitdiff
path: root/docs/rabbitmqctl.1.xml
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2015-12-03 15:09:54 +0300
committerMichael Klishin <michael@novemberain.com>2015-12-03 15:09:54 +0300
commit6e486a1e713f5a227ec7bfca2389cc81c63eddb9 (patch)
tree88ba02f0ad9b4cdaa8d21d772e069445db5c1bd8 /docs/rabbitmqctl.1.xml
parent92a3cd890fd4f5b506e496f429d90b2048bb5c7a (diff)
parenta9f7fef06380e7c29bb8d5d64c706be16732b553 (diff)
downloadrabbitmq-server-git-6e486a1e713f5a227ec7bfca2389cc81c63eddb9.tar.gz
Merge pull request #462 from rabbitmq/rabbitmq-server-448
Support setting vm_memory_high_watermark and disk_free_limit in units
Diffstat (limited to 'docs/rabbitmqctl.1.xml')
-rw-r--r--docs/rabbitmqctl.1.xml13
1 files changed, 10 insertions, 3 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index 885e3c4dd2..b9e478cb53 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -1958,15 +1958,22 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><cmdsynopsis><command>set_vm_memory_high_watermark absolute</command> <arg choice="req"><replaceable>memory_limit_in_bytes</replaceable></arg></cmdsynopsis></term>
+ <term><cmdsynopsis><command>set_vm_memory_high_watermark absolute</command> <arg choice="req"><replaceable>memory_limit</replaceable></arg></cmdsynopsis></term>
<listitem>
<variablelist>
<varlistentry>
- <term>memory_limit_in_bytes</term>
+ <term>memory_limit</term>
<listitem><para>
The new memory limit at which flow control is
triggered, expressed in bytes as an integer number
- greater than or equal to 0.
+ greater than or equal to 0 or as string with memory unit
+ (e.g. 1024MB). Available units are:
+ k, kiB: kibibytes (2^10 bytes)
+ M, MiB: mebibytes (2^20)
+ G, GiB: gibibytes (2^30)
+ kB: kilobytes (10^3)
+ MB: megabytes (10^6)
+ GB: gigabytes (10^9)
</para></listitem>
</varlistentry>
</variablelist>