diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-11-03 09:22:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 09:22:10 +0300 |
| commit | 84fb288e45e440a170686dd8acfb0730c6911af8 (patch) | |
| tree | b24328fba77abce98eef521b4e3bcc7c96ea81d1 | |
| parent | 9aa1093593a2a8d9d96832c08e6d724e7ba5e0d1 (diff) | |
| parent | ec99133836bdd69fb08a6cda577ba2099b4a7ee5 (diff) | |
| download | rabbitmq-server-git-84fb288e45e440a170686dd8acfb0730c6911af8.tar.gz | |
Merge pull request #1740 from rabbitmq/rabbitmq-server-161167716-2v3.8.0-beta.1
Merge some missed v3.7.x changes into master
| -rw-r--r-- | scripts/rabbitmq-diagnostics.bat | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-plugins.bat | 1 | ||||
| -rw-r--r-- | scripts/rabbitmqctl.bat | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat index 9ab60c5a9e..02bc9e5509 100644 --- a/scripts/rabbitmq-diagnostics.bat +++ b/scripts/rabbitmq-diagnostics.bat @@ -53,7 +53,6 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
-sasl errlog_type error ^
-mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
--nodename !RABBITMQ_NODENAME! ^
-run escript start ^
-escript main rabbitmqctl_escript ^
-extra "%RABBITMQ_HOME%\escript\rabbitmq-diagnostics" !STAR!
@@ -63,4 +62,3 @@ if ERRORLEVEL 1 ( )
endlocal
-endlocal
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index c4d1d93335..e0d269ea4e 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -411,7 +411,6 @@ run_escript() -kernel inet_dist_listen_max "$RABBITMQ_CTL_DIST_PORT_MAX" \ -sasl errlog_type error \ -mnesia dir "\"$RABBITMQ_MNESIA_DIR\"" \ - -nodename "$RABBITMQ_NODENAME" \ -run escript start \ -escript main "$escript_main" \ -extra "$escript" "$@" diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index ba207719b4..120830f5a6 100644 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -53,7 +53,6 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
-sasl errlog_type error ^
-mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
--nodename !RABBITMQ_NODENAME! ^
-run escript start ^
-escript main rabbitmqctl_escript ^
-extra "%RABBITMQ_HOME%\escript\rabbitmq-plugins" !STAR!
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 93645a5a36..1686073377 100644 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -53,7 +53,6 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
-sasl errlog_type error ^
-mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
--nodename !RABBITMQ_NODENAME! ^
-run escript start ^
-escript main rabbitmqctl_escript ^
-extra "%RABBITMQ_HOME%\escript\rabbitmqctl" !STAR!
|