diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-03-02 17:36:42 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-03-02 17:36:42 +0300 |
| commit | aace92afd7405cbff7597769079ad692a50d28cc (patch) | |
| tree | 2eae914b6b4e08fa2a6006ea33e8a93d7b7628bf | |
| parent | d7791b8954dc2fe1714d7ab06a0d3d23b5dddad1 (diff) | |
| parent | c2b0c69b4d6eb366c215933e0d8320f2b66bc4ab (diff) | |
| download | rabbitmq-server-git-aace92afd7405cbff7597769079ad692a50d28cc.tar.gz | |
Merge branch 'stable'
| -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 a9dd23f3b5..83e7237c80 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -99,5 +99,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} ]}]}. |