summaryrefslogtreecommitdiff
path: root/src/rabbit.app.src
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-09-27 11:20:29 +0200
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-09-27 11:20:29 +0200
commit25de0db933521881673c3889865815abc82b75e7 (patch)
treea182ea38e97faed13bc0ea94a9bbe641b3377dcf /src/rabbit.app.src
parente7ae83f5cf81b103f3f1e46a64a1e0053dc4ba74 (diff)
parenta40b517c4f20be94bc007e83541e18a3da85b5f5 (diff)
downloadrabbitmq-server-git-25de0db933521881673c3889865815abc82b75e7.tar.gz
Merge branch 'stable' into rabbitmq-management-236
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 572c1f6bc6..872336bd8e 100644
--- a/src/rabbit.app.src
+++ b/src/rabbit.app.src
@@ -95,7 +95,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}