diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-10-12 19:43:25 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-10-12 19:43:25 +0300 |
| commit | 7e727be95f1c15111547c3f713f3985d8015c2cb (patch) | |
| tree | 4dbf4241adc756bc96dc3c1be01c5cc511513de4 /docs/rabbitmq.conf.example | |
| parent | 2fee330fb67ab2de2582298c407cd66ed4319dfb (diff) | |
| parent | 9a7e4e61ec625f6cd7919eb36d76dae2b73ea927 (diff) | |
| download | rabbitmq-server-git-7e727be95f1c15111547c3f713f3985d8015c2cb.tar.gz | |
Merge branch 'rabbitmq-common-224-master-lrb'
Diffstat (limited to 'docs/rabbitmq.conf.example')
| -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. |