diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2019-08-08 13:16:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-08 13:16:10 +0300 |
| commit | c6345875055677fb4677298abb6b4daef46fce27 (patch) | |
| tree | 6bb7c722bf4a62241ce9870e7002e296602b6513 | |
| parent | 1984d6657531f9dbb2499a564143c6fe594fa67e (diff) | |
| parent | cd1957a210565110448fd228f3fc1e2880c2843e (diff) | |
| download | rabbitmq-server-git-c6345875055677fb4677298abb6b4daef46fce27.tar.gz | |
Merge pull request #2072 from rabbitmq/mk-cuttlefish-upgrade
Upgrade bundled Cuttlefish to 2.3.0 produced on Erlang/OTP 21.3
| -rwxr-xr-x | scripts/cuttlefish | bin | 468026 -> 508786 bytes | |||
| -rw-r--r-- | src/rabbit_config.erl | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/scripts/cuttlefish b/scripts/cuttlefish Binary files differindex f76590b068..e63ac1c1b3 100755 --- a/scripts/cuttlefish +++ b/scripts/cuttlefish diff --git a/src/rabbit_config.erl b/src/rabbit_config.erl index a98f8bc046..b0066183ee 100644 --- a/src/rabbit_config.erl +++ b/src/rabbit_config.erl @@ -145,6 +145,7 @@ generate_config_file(ConfFiles, ConfDir, ScriptDir, SchemaDir, Advanced) -> " -e ", "\"", ConfDir, "\"", [[" -c ", ConfFile] || ConfFile <- ConfFiles], AdvancedConfigArg]), + rabbit_log:debug("Generating config file using '~s'", [Command]), Result = rabbit_misc:os_cmd(Command), case string:str(Result, " -config ") of 0 -> {error, {generation_error, Result}}; |