diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2018-11-22 09:47:16 +0100 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2018-11-22 09:47:16 +0100 |
| commit | 744a307dea1befdadc030b453dfa0eeab74aae29 (patch) | |
| tree | 896b0a99c2d796aa31c499d3f31b887a5bd54f84 /Makefile | |
| parent | 5745100835f4ea95e5ff6cd92d949ddc7dd296a2 (diff) | |
| parent | af68fc873ef7b34eba922cedac0e62b99adf1dd0 (diff) | |
| download | rabbitmq-server-git-744a307dea1befdadc030b453dfa0eeab74aae29.tar.gz | |
Merge branch 'master' into rabbitmq-server-1743-exclusive-consumer
Conflicts:
src/rabbit_amqqueue.erl
src/rabbit_amqqueue_process.erl
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -96,6 +96,8 @@ define PROJECT_ENV %% see rabbitmq-server#143, %% rabbitmq-server#949, rabbitmq-server#1098 {credit_flow_default_credit, {400, 200}}, + {quorum_commands_soft_limit, 256}, + {quorum_cluster_size, 5}, %% see rabbitmq-server#248 %% and rabbitmq-server#667 {channel_operation_timeout, 15000}, @@ -127,13 +129,14 @@ define PROJECT_ENV %% vhost had to shut down, see server#1158 and server#1280 {vhost_restart_strategy, continue}, %% {global, prefetch count} - {default_consumer_prefetch, {false, 0}} + {default_consumer_prefetch, {false, 0}}, + {channel_queue_cleanup_interval, 60000} ] endef LOCAL_DEPS = sasl mnesia os_mon inets BUILD_DEPS = rabbitmq_cli syslog -DEPS = ranch lager rabbit_common +DEPS = ranch lager rabbit_common ra TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client meck proper dep_syslog = git https://github.com/schlagert/syslog 3.4.5 |