summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2017-10-11 07:06:57 +0100
committerMichael Klishin <mklishin@pivotal.io>2017-10-12 18:58:52 +0300
commite32c7d3f281456bad0ee1a47214007668175f6fa (patch)
tree6cc52cc32519905a2d6dc55b3ae6a5c58262a57d /docs
parent828a978ec6f426a5e6af0798d21317f07a7c6695 (diff)
downloadrabbitmq-server-git-e32c7d3f281456bad0ee1a47214007668175f6fa.tar.gz
Update default allocator strategy to match rabbitmq/rabbitmq-common#224
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmq.config.example10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index 60af5b7eea..0882764a3a 100644
--- a/docs/rabbitmq.config.example
+++ b/docs/rabbitmq.config.example
@@ -258,11 +258,11 @@
%%
%% {vm_memory_high_watermark_paging_ratio, 0.5},
- %% Selects Erlang VM memory consumption calculation strategy. Can be `rss` or `erlang`,
- %% `rss` is the default. Introduced in 3.6.11.
- %% See https://github.com/rabbitmq/rabbitmq-server/issues/1223 for background.
- %% {vm_memory_calculation_strategy, rss},
-
+ %% Selects Erlang VM memory consumption calculation strategy. Can be `allocated`, `rss` or `legacy` (aliased as `erlang`),
+ %% Introduced in 3.6.11. `allocated` is the default as of 3.6.13.
+ %% See https://github.com/rabbitmq/rabbitmq-server/issues/1223 and rabbitmq/rabbitmq-common#224 for background.
+ %% {vm_memory_calculation_strategy, allocated},
+
%% Interval (in milliseconds) at which we perform the check of the memory
%% levels against the watermarks.
%%