root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into rabbitmq-server-505

This commit is contained in:
Arnaud Cogoluègnes 2016-12-27 17:07:36 +01:00
parent f13e6ac834 4f007a5f13
commit a256f447a0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/rabbitmq_auth_backend_ldap/test/system_SUITE.erl vendored
View File

@ -766,11 +766,7 @@ control_action(Config, Command, Args, NewOpts) ->
expand_options(default_options(), NewOpts)). expand_options(default_options(), NewOpts)).
control_action(_Config, Command, Node, Args, Opts) -> control_action(_Config, Command, Node, Args, Opts) ->
case catch rabbit_control_main:action( case rabbit_control_helper:command(Command, Node, Args, Opts) of
Command, Node, Args, Opts,
fun (Format, Args1) ->
io:format(Format ++ " ...~n", Args1)
end) of
ok -> ok ->
io:format("done.~n"), io:format("done.~n"),
ok; ok;