summaryrefslogtreecommitdiff
path: root/src/rabbit.app.src
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2016-09-15 17:05:23 +0300
committerMichael Klishin <michael@clojurewerkz.org>2016-09-15 17:05:23 +0300
commit0e60c60954378b4339ed77d1e5b71e07f0bac002 (patch)
tree1ee03ed1fddf3c726422649b3d4b9a8233347664 /src/rabbit.app.src
parent6577b1041b5e3f0b4d8bf89593afdf3c5d23017a (diff)
parent1b0096a925ba56af16d4776713a5c8e9593c587a (diff)
downloadrabbitmq-server-git-0e60c60954378b4339ed77d1e5b71e07f0bac002.tar.gz
Merge branch 'master' into rabbitmq-server-501
Diffstat (limited to 'src/rabbit.app.src')
-rw-r--r--src/rabbit.app.src3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit.app.src b/src/rabbit.app.src
index 738a38e2bb..2e17bbbc3c 100644
--- a/src/rabbit.app.src
+++ b/src/rabbit.app.src
@@ -98,7 +98,8 @@
{msg_store_credit_disc_bound, {2000, 500}},
{msg_store_io_batch_size, 2048},
%% see rabbitmq-server#143
- {credit_flow_default_credit, {200, 50}},
+ %% and rabbitmq-server#949
+ {credit_flow_default_credit, {200, 100}},
%% see rabbitmq-server#248
%% and rabbitmq-server#667
{channel_operation_timeout, 15000}