diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2017-10-12 08:11:03 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2017-10-12 08:15:54 -0700 |
| commit | f678d1ba15375b56689d10c6eee4e09177cc5ac4 (patch) | |
| tree | e742e57ad8cbeba8e7d9e12fcce20bdbc954975e /docs | |
| parent | 50b978f411e514d6fb41eb6e87020da1498e25d7 (diff) | |
| download | rabbitmq-server-git-f678d1ba15375b56689d10c6eee4e09177cc5ac4.tar.gz | |
Add additional vm_memory_calculation_strategy values to cuttlefish conf
Requires rabbitmq/rabbitmq-common#224
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/rabbitmq.conf.example | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/rabbitmq.conf.example b/docs/rabbitmq.conf.example index eb45bffbf5..92bce4a1fd 100644 --- a/docs/rabbitmq.conf.example +++ b/docs/rabbitmq.conf.example @@ -267,10 +267,10 @@ ## # 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. |