diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2019-02-01 20:18:19 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2019-02-01 20:18:19 +0300 |
| commit | 160d70cc7840c3be60e0ae6786a182d67707140a (patch) | |
| tree | 02b2892828de63fce66699a0755e82835e4cd654 /scripts/rabbitmq-server | |
| parent | abd9a2d997b66a38ba0f4febdfa778708feb5c22 (diff) | |
| parent | ed3dd4d6257df0925ce78ad94de099304346da4c (diff) | |
| download | rabbitmq-server-git-160d70cc7840c3be60e0ae6786a182d67707140a.tar.gz | |
Merge branch 'master' into dead-letter-testing
Conflicts:
src/rabbit_quorum_queue.erl
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index efff38c3af..aeac38e46f 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -195,6 +195,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -s rabbit_prelaunch \ ${RABBITMQ_NAME_TYPE} ${RABBITMQ_PRELAUNCH_NODENAME} \ -conf_advanced "${RABBITMQ_ADVANCED_CONFIG_FILE}" \ + -rabbit feature_flags_file "\"$RABBITMQ_FEATURE_FLAGS_FILE\"" \ -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \ -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \ -extra "${RABBITMQ_NODENAME}" @@ -302,6 +303,7 @@ start_rabbitmq_server() { -rabbit lager_log_root "\"$RABBITMQ_LOG_BASE\"" \ -rabbit lager_default_file "$RABBIT_LAGER_HANDLER" \ -rabbit lager_upgrade_file "$RABBITMQ_LAGER_HANDLER_UPGRADE" \ + -rabbit feature_flags_file "\"$RABBITMQ_FEATURE_FLAGS_FILE\"" \ -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \ -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \ -rabbit plugins_expand_dir "\"$RABBITMQ_PLUGINS_EXPAND_DIR\"" \ |