diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-19 17:12:08 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-19 17:12:08 +0000 |
| commit | 173260d91e1f10ba0e5ef2cd16889ccd5bb28dab (patch) | |
| tree | b8b323ef208d833760fcce21b86e860a8b513a6b /src | |
| parent | 5e10fa5b9ec26c8934b477007a83e556cbac719f (diff) | |
| parent | 1b511b72c6ac58a21157e08349344ca5a23894e5 (diff) | |
| download | rabbitmq-server-git-173260d91e1f10ba0e5ef2cd16889ccd5bb28dab.tar.gz | |
Merge branch 'master' into rabbitmq-server-550
Conflicts:
scripts/rabbitmq-env.bat
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} ]}]}. |