diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-03-04 01:02:47 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-03-04 01:02:47 +0300 |
| commit | 3ee51f779ac237d33c9d07a7214a3aa75248c404 (patch) | |
| tree | 1bccf3c72c5c27a72b2c5ac4b99be2d8af4eaad1 /src/rabbit.app.src | |
| parent | e56a3ab64d7f756f1d95e954c227348f0b2381de (diff) | |
| parent | 9bffa7957ecea99b9d3363a55f12d590c0af8bf9 (diff) | |
| download | rabbitmq-server-git-3ee51f779ac237d33c9d07a7214a3aa75248c404.tar.gz | |
Merge branch 'stable' into rabbitmq-server-346
Diffstat (limited to 'src/rabbit.app.src')
| -rw-r--r-- | src/rabbit.app.src | 3 |
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} ]}]}. |