diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-06-27 10:18:01 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-06-27 10:18:01 +0300 |
| commit | fcc9879f56941ce004c50965dabae934b4103ab1 (patch) | |
| tree | 0b0dc6fd4aecec92ec620e1a8b9a266c636fe299 /Makefile | |
| parent | 10fd03dbf2168aed1cb7e96da7c3603444f1e449 (diff) | |
| parent | 2e99c66d76be0fe77af51b66deb79e9ee347b208 (diff) | |
| download | rabbitmq-server-git-fcc9879f56941ce004c50965dabae934b4103ab1.tar.gz | |
Merge branch 'master' into rabbitmq-common-198
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -16,6 +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, rss}, {memory_monitor_interval, 2500}, {disk_free_limit, 50000000}, %% 50MB {msg_store_index_module, rabbit_msg_store_ets_index}, @@ -125,7 +126,7 @@ define PROJECT_ENV ] endef -LOCAL_DEPS = sasl mnesia os_mon +LOCAL_DEPS = sasl mnesia os_mon inets BUILD_DEPS = rabbitmq_cli DEPS = ranch lager rabbit_common TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client meck proper |