diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2017-06-20 15:01:58 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2017-06-20 15:01:58 -0700 |
| commit | 59ce657abcdbbed66799f466792657709baae37d (patch) | |
| tree | a98982fb337c24aef536955fb31f3afa1a41a524 /Makefile | |
| parent | dd18cf3540bc4e87b4a5d586a6c88a4bf8b88874 (diff) | |
| parent | 72415b1c9446db5ad38b7d70a45fec6942682ec0 (diff) | |
| download | rabbitmq-server-git-59ce657abcdbbed66799f466792657709baae37d.tar.gz | |
Merge branch 'master' into rabbitmq-server-1246-master
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 |