summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2017-10-19 03:39:28 +0300
committerMichael Klishin <michael@clojurewerkz.org>2017-10-19 03:39:28 +0300
commit75d626aeca02c664ab4071f31fbbd4484c2c5603 (patch)
treef117863d53eb64251463b97af38140aa9c25a5d3
parent4c7c5cf6114f3b0ed327923812ca7202e5ac093b (diff)
parente0164ec636dfdc144113dbe807cd6cf6510052fd (diff)
downloadrabbitmq-server-git-75d626aeca02c664ab4071f31fbbd4484c2c5603.tar.gz
Merge branch 'default-to-rss-152081051-master'
-rw-r--r--priv/schema/rabbit.schema2
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema
index dcf49e0c3e..734a8a4102 100644
--- a/priv/schema/rabbit.schema
+++ b/priv/schema/rabbit.schema
@@ -689,7 +689,7 @@ end}.
%% Selects Erlang VM memory consumption calculation strategy.
%% Can be `allocated`, `rss` or `legacy` (aliased as `erlang`).
%%
-%% {vm_memory_calculation_strategy, allocated},
+%% {vm_memory_calculation_strategy, rss},
{mapping, "vm_memory_calculation_strategy", "rabbit.vm_memory_calculation_strategy",
[{datatype, {enum, [rss, erlang, allocated, legacy]}}]}.