Merge branch 'master' into rabbitmq-server-505

2016-12-27 17:07:36 +01:00 · 2016-12-27 17:07:36 +01:00 · a256f447a0
parent f13e6ac834 4f007a5f13
commit a256f447a0
1 changed files with 1 additions and 5 deletions
--- a/deps/rabbitmq_auth_backend_ldap/test/system_SUITE.erl
+++ b/deps/rabbitmq_auth_backend_ldap/test/system_SUITE.erl
@ -766,11 +766,7 @@ control_action(Config, Command, Args, NewOpts) ->
                   expand_options(default_options(), NewOpts)).

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