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 /scripts/rabbitmq-server | |
| 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 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 36dca38882..d66e2517c6 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -311,6 +311,7 @@ start_rabbitmq_server() { -os_mon start_disksup false \ -os_mon start_memsup false \ -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ + -ra data_dir "\"${RABBITMQ_QUORUM_DIR}\"" \ ${RABBITMQ_SERVER_START_ARGS} \ ${RABBITMQ_DIST_ARG} \ "$@" |