summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2017-10-19 02:59:33 +0300
committerGitHub <noreply@github.com>2017-10-19 02:59:33 +0300
commit9361e2d3936bac21d6b28c73dc431bb41d387b50 (patch)
tree68a0b1af137d84bb18ed5aefe2315c9c28f05f61
parent8d8246b6ac249956125d082de057ae8f74725f0f (diff)
parent5b16c4e08813dae10aac12f925ab79265d0626b5 (diff)
downloadrabbitmq-server-git-9361e2d3936bac21d6b28c73dc431bb41d387b50.tar.gz
Merge pull request #1397 from rabbitmq/default-to-rss-152081051
Default mem calc strategy should be "rss"
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cb7d07e650..f97021920c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ define PROJECT_ENV
{ssl_options, []},
{vm_memory_high_watermark, 0.4},
{vm_memory_high_watermark_paging_ratio, 0.5},
- {vm_memory_calculation_strategy, allocated},
+ {vm_memory_calculation_strategy, rss},
{memory_monitor_interval, 2500},
{disk_free_limit, 50000000}, %% 50MB
{msg_store_index_module, rabbit_msg_store_ets_index},