summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2019-04-24 23:51:40 +0300
committerMichael Klishin <michael@clojurewerkz.org>2019-04-24 23:51:40 +0300
commitc9edbec027222ff276933bc9168b7f1f159c2a00 (patch)
tree6f73b03d5d7b08fdeb4e793d110b805644de39ca /Makefile
parent388bd440babf102d8d7d0289e23bdd5e7df8604b (diff)
parent20221724ac23389221fb7f9534ffc9978c282bba (diff)
downloadrabbitmq-server-git-c9edbec027222ff276933bc9168b7f1f159c2a00.tar.gz
Merge branch 'master' into quorum-ets-memory-breakdown
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 87b57f1ffe..9e818a8937 100644
--- a/Makefile
+++ b/Makefile
@@ -109,11 +109,7 @@ define PROJECT_ENV
%% used by rabbit_peer_discovery_classic_config
{cluster_nodes, {[], disc}},
- {config_entry_decoder, [{cipher, aes_cbc256},
- {hash, sha512},
- {iterations, 1000},
- {passphrase, undefined}
- ]},
+ {config_entry_decoder, [{passphrase, undefined}]},
%% rabbitmq-server#973
{queue_explicit_gc_run_operation_threshold, 1000},
@@ -130,7 +126,8 @@ define PROJECT_ENV
{vhost_restart_strategy, continue},
%% {global, prefetch count}
{default_consumer_prefetch, {false, 0}},
- {channel_queue_cleanup_interval, 60000},
+ %% interval at which the channel can perform periodic actions
+ {channel_tick_interval, 60000},
%% Default max message size is 128 MB
{max_message_size, 134217728}
]