summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2016-03-02 17:36:20 +0300
committerMichael Klishin <michael@novemberain.com>2016-03-02 17:36:20 +0300
commitc2b0c69b4d6eb366c215933e0d8320f2b66bc4ab (patch)
treeb39f39bb844537e47bef8a5381502f8ed5778b6f
parent9c33c701fa496826b53a7a387da3b5e4beaa6e87 (diff)
parent88106e6a8375692436a7c0c40aaeea06f1293937 (diff)
downloadrabbitmq-server-git-c2b0c69b4d6eb366c215933e0d8320f2b66bc4ab.tar.gz
Merge pull request #669 from rabbitmq/rabbitmq-server-667
Bump rabbit.channel_operation_timeout default to 15s
-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 bb9cf2d124..572c1f6bc6 100644
--- a/src/rabbit.app.src
+++ b/src/rabbit.app.src
@@ -97,5 +97,6 @@
%% see rabbitmq-server#143
{credit_flow_default_credit, {200, 50}},
%% see rabbitmq-server#248
- {channel_operation_timeout, 5000}
+ %% and rabbitmq-server#667
+ {channel_operation_timeout, 15000}
]}]}.