summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2017-10-19 14:53:22 +0300
committerMichael Klishin <michael@clojurewerkz.org>2017-10-19 14:53:22 +0300
commitdc915bac01ab09614ab055818f7b2a5e13200fd5 (patch)
tree57fac26677f433c08b99e02a99ec8d1350b9c135
parentc574fc5c528be505f846ff51cf8cb6f9325c694e (diff)
parent9361e2d3936bac21d6b28c73dc431bb41d387b50 (diff)
downloadrabbitmq-server-git-dc915bac01ab09614ab055818f7b2a5e13200fd5.tar.gz
Merge branch 'stable' into rabbitmq-server-batch-betas
-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},