diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-11-24 12:00:42 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-11-24 12:00:42 +0100 |
| commit | bfd14dd7ff1a7eb28c00a44d5d52887f42cd603d (patch) | |
| tree | c3aa531499314917188806a073ef2fde590f4c1e /src/rabbit.app.src | |
| parent | 1bd0fa11a08e311718d0c0162ab38aa646068790 (diff) | |
| parent | beb8e52c3648c06340c4c1d6b573a2570d4ee0dd (diff) | |
| download | rabbitmq-server-git-bfd14dd7ff1a7eb28c00a44d5d52887f42cd603d.tar.gz | |
Merge branch 'stable' into rabbitmq-management-236
Diffstat (limited to 'src/rabbit.app.src')
| -rw-r--r-- | src/rabbit.app.src | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rabbit.app.src b/src/rabbit.app.src index 872336bd8e..dd38ad4072 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -99,5 +99,13 @@ {credit_flow_default_credit, {200, 100}}, %% see rabbitmq-server#248 %% and rabbitmq-server#667 - {channel_operation_timeout, 15000} + {channel_operation_timeout, 15000}, + {config_entry_decoder, [ + {cipher, aes_cbc256}, + {hash, sha512}, + {iterations, 1000}, + {passphrase, undefined} + ]}, + %% rabbitmq-server-973 + {lazy_queue_explicit_gc_run_operation_threshold, 250} ]}]}. |