diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-02-18 18:31:05 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2016-02-18 18:31:05 +0300 |
| commit | 0f60daf36232578b023e365dcd7c0be6166c82b2 (patch) | |
| tree | e4cf521279d878d65c4dd5069a97d1cb25ef4ad4 /src | |
| parent | b84ebceb5d55f73ac9ca7eee9ec4a4d96f357a94 (diff) | |
| parent | c66d51f4f57c425bfa2fa152bd4895ed56915ceb (diff) | |
| download | rabbitmq-server-git-0f60daf36232578b023e365dcd7c0be6166c82b2.tar.gz | |
Merge pull request #635 from rabbitmq/rabbitmq-server-248rabbitmq_v3_6_1_rc2
Introduce rabbit.channel_operation_timeout
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 4ee0191138..bb9cf2d124 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -95,5 +95,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} ]}]}. |