Merge branch 'stable'

Daniil Fedotov · Daniil Fedotov · commit 7860f99e7499 · 2017-09-12T17:35:04.000+01:00
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
@@ -327,7 +327,6 @@ rem [ "x" = "x$RABBITMQ_UPGRADE_LOG" ] && RABBITMQ_UPGRADE_LOG="${RABBITMQ_LOG_B
 if "!RABBITMQ_UPGRADE_LOG!" == "" (
     set RABBITMQ_UPGRADE_LOG=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!_upgrade.log
 )
-
 REM [ "x" = "x$ERL_CRASH_DUMP"] && ERL_CRASH_DUMP="${RABBITMQ_LOG_BASE}/erl_crash.dump"
 if "!ERL_CRASH_DUMP!"=="" (
     set ERL_CRASH_DUMP=!RABBITMQ_LOG_BASE!\erl_crash.dump

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,6 @@ rem [ "x" = "x$RABBITMQ_UPGRADE_LOG" ] && RABBITMQ_UPGRADE_LOG="${RABBITMQ_LOG_B`
`327`	`327`	`if "!RABBITMQ_UPGRADE_LOG!" == "" (`
`328`	`328`	`set RABBITMQ_UPGRADE_LOG=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!_upgrade.log`
`329`	`329`	`)`
`330`		`-`
`331`	`330`	`REM [ "x" = "x$ERL_CRASH_DUMP"] && ERL_CRASH_DUMP="${RABBITMQ_LOG_BASE}/erl_crash.dump"`
`332`	`331`	`if "!ERL_CRASH_DUMP!"=="" (`
`333`	`332`	`set ERL_CRASH_DUMP=!RABBITMQ_LOG_BASE!\erl_crash.dump`