diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-07-28 21:37:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-28 21:37:42 +0300 |
| commit | e84ba4ca9329243879f51bf147f079519171c81f (patch) | |
| tree | 566e8a702fe706a0e4cfaa67f5ed7b2adc932d83 /Makefile | |
| parent | 118666d7caba0e494ec3f8144c0a35e12130a9a1 (diff) | |
| parent | 77101e7fadaac0bf12b862c6c6cf48e08eb97e4b (diff) | |
| download | rabbitmq-server-git-e84ba4ca9329243879f51bf147f079519171c81f.tar.gz | |
Merge branch 'master' into fix-travis-ci-build
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -112,17 +112,19 @@ define PROJECT_ENV {passphrase, undefined} ]}, - %% rabbitmq-server-973 + %% rabbitmq-server#973 {queue_explicit_gc_run_operation_threshold, 1000}, {lazy_queue_explicit_gc_run_operation_threshold, 1000}, {background_gc_enabled, false}, {background_gc_target_interval, 60000}, - %% rabbitmq-server-589 + %% rabbitmq-server#589 {proxy_protocol, false}, {disk_monitor_failure_retries, 10}, {disk_monitor_failure_retry_interval, 120000}, - %% either "stop_node" or "ignore" - {vhost_restart_strategy, stop_node} + %% either "stop_node" or "continue". + %% by default we choose to not terminate the entire node if one + %% vhost had to shut down, see server#1158 and server#1280 + {vhost_restart_strategy, continue} ] endef |