summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorAlvaro Videla <videlalvaro@gmail.com>2015-08-28 16:41:24 +0200
committerAlvaro Videla <videlalvaro@gmail.com>2015-08-28 16:41:24 +0200
commit623f1de05bccad3170d26438816855ef1e439256 (patch)
tree4a1c744748c15e3c404ad9abf844922381fddb59 /ebin
parent75071795bfa4581cc08a39529e27f06c767079f2 (diff)
parent1085e243a6df514f675b452aa96ffa23b6632ac3 (diff)
downloadrabbitmq-server-git-623f1de05bccad3170d26438816855ef1e439256.tar.gz
Merge branch 'stable' into rabbitmq-server-289
Diffstat (limited to 'ebin')
-rw-r--r--ebin/rabbit_app.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index 37658d7312..636851989e 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -83,5 +83,8 @@
gen_fsm, ssl]},
{ssl_apps, [asn1, crypto, public_key, ssl]},
%% see rabbitmq-server#114
- {mirroring_flow_control, true}
+ {mirroring_flow_control, true},
+ %% see rabbitmq-server#227 and related tickets
+ {msg_store_credit_disc_bound, {2000, 500}},
+ {msg_store_io_batch_size, 2048}
]}]}.