diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-02-18 18:31:56 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-02-18 18:31:56 +0300 |
| commit | 3a57615bd41dd77aa50577c2a3788972d7eb958c (patch) | |
| tree | 6b24f1e041d6f5435e2bd47b2e4e72c3d14bb4a4 /src | |
| parent | 0d68c00abcc11af44984233182a852706f557e26 (diff) | |
| parent | 0f60daf36232578b023e365dcd7c0be6166c82b2 (diff) | |
| download | rabbitmq-server-git-3a57615bd41dd77aa50577c2a3788972d7eb958c.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.app.src | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit.app.src b/src/rabbit.app.src index f347b24585..a9dd23f3b5 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -97,5 +97,7 @@ {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 + {channel_operation_timeout, 5000} ]}]}. |