diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2015-11-23 21:08:54 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2015-11-23 21:08:54 +0300 |
| commit | 87479ab442124833105f2a5d1bc373c250a5c3f5 (patch) | |
| tree | 9a7d39d232338579951636f3509df992a236a965 | |
| parent | 056fa2e2cd0dbcae5140a75eaf8a490b92daa448 (diff) | |
| parent | 5d45ac7664f82261d9479551e0affe657ede1977 (diff) | |
| download | rabbitmq-server-git-87479ab442124833105f2a5d1bc373c250a5c3f5.tar.gz | |
Merge branch 'stable'
Conflicts:
scripts/rabbitmq-env.bat
| -rw-r--r-- | scripts/rabbitmq-env.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 93a0094c47..b50468a909 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -221,7 +221,7 @@ if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" ( REM [ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR=${PLUGINS_DIR}
if "!RABBITMQ_PLUGINS_DIR!"=="" (
if "!PLUGINS_DIR!"=="" (
- set RABBITMQ_PLUGINS_DIR=!RABBITMQ_BASE!\plugins
+ set RABBITMQ_PLUGINS_DIR=!RABBITMQ_HOME!\plugins
) else (
set RABBITMQ_PLUGINS_DIR=!PLUGINS_DIR!
)
|