diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-03-02 19:30:42 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-03-02 19:30:42 +0300 |
| commit | 188d7a06e21d75220d0d0a718164f717a92cb70e (patch) | |
| tree | 1b0d78fe3bcdafa0077e8d34c0820777b7a25adb /src/rabbit.app.src | |
| parent | 11a09bd729af49e843ddefec8d82425111f7a972 (diff) | |
| parent | c2b0c69b4d6eb366c215933e0d8320f2b66bc4ab (diff) | |
| download | rabbitmq-server-git-188d7a06e21d75220d0d0a718164f717a92cb70e.tar.gz | |
Merge branch 'stable' into rabbitmq-server-398
Diffstat (limited to 'src/rabbit.app.src')
| -rw-r--r-- | src/rabbit.app.src | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit.app.src b/src/rabbit.app.src index 4ee0191138..572c1f6bc6 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -95,5 +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}} + {credit_flow_default_credit, {200, 50}}, + %% see rabbitmq-server#248 + %% and rabbitmq-server#667 + {channel_operation_timeout, 15000} ]}]}. |