diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-12-20 18:17:10 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-12-20 18:17:10 +0000 |
| commit | 5f7553c0bd2eac3fc311761bc2b81763f537c1e5 (patch) | |
| tree | 8949e9f56ce669d90c4b2ac8eb8b9760c7d95aca /scripts/rabbitmq-env | |
| parent | 3d568701e733dfb07d9a61390c192364ad4ce68a (diff) | |
| parent | cbbcc3e32f97b6047b4f82f0776717dd3e85430c (diff) | |
| download | rabbitmq-server-git-5f7553c0bd2eac3fc311761bc2b81763f537c1e5.tar.gz | |
Merge branch 'master' into rabbitmq-server-567
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index f1624eddf9..e9e83f6313 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -220,10 +220,6 @@ rmq_normalize_path_var RABBITMQ_PID_FILE [ "x" = "x$RABBITMQ_BOOT_MODULE" ] && RABBITMQ_BOOT_MODULE=${BOOT_MODULE} -[ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} -[ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand -rmq_normalize_path_var RABBITMQ_PLUGINS_EXPAND_DIR - [ "x" != "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE_source=environment [ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} rmq_normalize_path_var RABBITMQ_ENABLED_PLUGINS_FILE @@ -253,7 +249,6 @@ rmq_check_if_shared_with_mnesia \ RABBITMQ_CONFIG_FILE \ RABBITMQ_LOG_BASE \ RABBITMQ_PID_FILE \ - RABBITMQ_PLUGINS_EXPAND_DIR \ RABBITMQ_ENABLED_PLUGINS_FILE \ RABBITMQ_PLUGINS_DIR \ RABBITMQ_LOGS \ |