diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2017-10-19 07:02:14 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2017-10-19 07:02:14 -0700 |
| commit | e7ca399a9f310de2cfe86e9bfe335f32fed19bf5 (patch) | |
| tree | 493f2b8f5a8161349e629227e93a425214529275 | |
| parent | 75d626aeca02c664ab4071f31fbbd4484c2c5603 (diff) | |
| parent | be796e0c6fe9237ab5e9b1bae86b0de2f7b0a19a (diff) | |
| download | rabbitmq-server-git-e7ca399a9f310de2cfe86e9bfe335f32fed19bf5.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | docs/rabbitmq.config.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index 9202b074da..9b30f89d4c 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -267,9 +267,9 @@ %% {vm_memory_high_watermark_paging_ratio, 0.5}, %% 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. + %% Introduced in 3.6.11. `rss` is the default as of 3.6.12. %% See https://github.com/rabbitmq/rabbitmq-server/issues/1223 and rabbitmq/rabbitmq-common#224 for background. - %% {vm_memory_calculation_strategy, allocated}, + %% {vm_memory_calculation_strategy, rss}, %% Interval (in milliseconds) at which we perform the check of the memory %% levels against the watermarks. |