summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-10-25 18:26:18 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-10-25 18:26:18 +0100
commit5ccfaebca6b8d93b556d921b73d0dfe103fba085 (patch)
tree5bafeeef9548fa1a7208a0969fdf36a9aaa531be /ebin
parent97980f20323416911ae3cb05a49b3bf3b42ebb99 (diff)
parentdcb789ec73460ca7339eea8dea6a39d6f0e84ffe (diff)
downloadrabbitmq-server-git-5ccfaebca6b8d93b556d921b73d0dfe103fba085.tar.gz
Merge in stable
Diffstat (limited to 'ebin')
-rw-r--r--ebin/rabbit_app.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index a4582e2db5..6ee0115b67 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -18,7 +18,8 @@
{ssl_listeners, []},
{ssl_options, []},
{vm_memory_high_watermark, 0.4},
- {disk_free_limit, 1000000000}, %% 1GB
+ {vm_memory_high_watermark_paging_ratio, 0.5},
+ {disk_free_limit, 50000000}, %% 50MB
{msg_store_index_module, rabbit_msg_store_ets_index},
{backing_queue_module, rabbit_variable_queue},
%% 0 ("no limit") would make a better default, but that