diff options
| author | Tim Watson <tim.watson@gmail.com> | 2012-05-21 14:41:57 +0100 |
|---|---|---|
| committer | Tim Watson <tim.watson@gmail.com> | 2012-05-21 14:41:57 +0100 |
| commit | 13389eb3fb5b53d5c4d5429f7dc052e528391c3d (patch) | |
| tree | 2b4bfda8316cbb27f562a159ae12a8524b20e349 /src | |
| parent | a57dae43426c0a0bbffcd361e84f59eda92c7276 (diff) | |
| download | rabbitmq-server-git-13389eb3fb5b53d5c4d5429f7dc052e528391c3d.tar.gz | |
manually merge 3c20079f0601
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control_main.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 6dc8d445dd..b1c120bd8c 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -14,7 +14,7 @@ %% Copyright (c) 2007-2012 VMware, Inc. All rights reserved. %% --module(rabbit_control). +-module(rabbit_control_main). -include("rabbit.hrl"). -export([start/0, stop/0, action/5]). diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 96b5fa3885..c73a51c95c 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1573,7 +1573,7 @@ control_action(Command, Args, NewOpts) -> expand_options(default_options(), NewOpts)). control_action(Command, Node, Args, Opts) -> - case catch rabbit_control:action( + case catch rabbit_control_main:action( Command, Node, Args, Opts, fun (Format, Args1) -> io:format(Format ++ " ...~n", Args1) |