summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2017-10-19 02:59:48 +0300
committerMichael Klishin <michael@clojurewerkz.org>2017-10-19 02:59:48 +0300
commit4c7c5cf6114f3b0ed327923812ca7202e5ac093b (patch)
treeb695e89ca8d73e7ce944956d48153c6868625a3b
parent1cbfd896d184f6f9cf7af0cca9ae63f77b2504dd (diff)
parent9361e2d3936bac21d6b28c73dc431bb41d387b50 (diff)
downloadrabbitmq-server-git-4c7c5cf6114f3b0ed327923812ca7202e5ac093b.tar.gz
Merge branch 'stable'
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 45720697b8..16fb2175bc 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},