diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-08-25 13:47:35 -0600 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-08-25 13:47:35 -0600 |
| commit | d86f10c66d9bfc61a21f957e0cfc2b092a336bb8 (patch) | |
| tree | 4cb483bdf0f6ba7c59c777885f85acb562172c74 | |
| parent | ef1a5a0596e022cae8310d6e04c667c28b6902cc (diff) | |
| parent | f2afe31fcca09a24c17debac1c07b4bba6de13c4 (diff) | |
| download | rabbitmq-server-git-d86f10c66d9bfc61a21f957e0cfc2b092a336bb8.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | docs/rabbitmq.config.example | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index b7f08afc78..77b7df743b 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -251,6 +251,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}, + %% Interval (in milliseconds) at which we perform the check of the memory %% levels against the watermarks. %% |