Merge pull request #432 from rabbitmq/rabbitmq-server-428

Discards rabbit_ctl_misc and updates its references

2 files changed, 1 insertions, 32 deletions

diff --git a/src/rabbit_cli.erl b/src/rabbit_cli.erl
index 311906afc6..c170e9d9f0 100644
--- a/src/rabbit_cli.erl
+++ b/src/rabbit_cli.erl
@@ -70,7 +70,7 @@ main(ParseFun, DoFun, UsageMod) ->
         ok ->
             rabbit_misc:quit(?EX_OK);
         {ok, Result} ->
-            rabbit_ctl_misc:print_cmd_result(Command, Result),
+            rabbit_control_misc:print_cmd_result(Command, Result),
             rabbit_misc:quit(?EX_OK);
         {'EXIT', {function_clause, [{?MODULE, action, _}    | _]}} -> %% < R15
             PrintInvalidCommandError(),
diff --git a/src/rabbit_ctl_misc.erl b/src/rabbit_ctl_misc.erl
deleted file mode 100644
index 92ae111028..0000000000
--- a/src/rabbit_ctl_misc.erl
+++ /dev/null
@@ -1,31 +0,0 @@
-%% The contents of this file are subject to the Mozilla Public License
-%% Version 1.1 (the "License"); you may not use this file except in
-%% compliance with the License. You may obtain a copy of the License
-%% at http://www.mozilla.org/MPL/
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and
-%% limitations under the License.
-%%
-%% The Original Code is RabbitMQ.
-%%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
-%%
-
--module(rabbit_ctl_misc).
-
--export([print_cmd_result/2]).
-
-%%----------------------------------------------------------------------------
-
--ifdef(use_specs).
-
--spec(print_cmd_result/2 :: (atom(), term()) -> string()).
-
--endif.
-
-%%----------------------------------------------------------------------------
-
-print_cmd_result(authenticate_user, _Result) -> io:format("Success~n").