diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2009-01-14 07:41:15 +0000 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2009-01-14 07:41:15 +0000 |
| commit | 3b32d5da94c00f776c19a3fafa541f2b86dca117 (patch) | |
| tree | 59b5a3151c40d6bba537871a34ee91962be91f9d /src | |
| parent | d56c0a3d410a026a20dff9a44a810d4014d67c38 (diff) | |
| parent | cfbd3b0d15ffd0954d03d9babf1e65d5328f50d2 (diff) | |
| download | rabbitmq-server-git-3b32d5da94c00f776c19a3fafa541f2b86dca117.tar.gz | |
Merged 20141 into v1_5_1
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 1e07f6d27c..cbc11b4031 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -57,7 +57,7 @@ start() -> true -> ok; false -> io:format("...done.~n") end, - init:stop(); + halt(); {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} -> error("invalid command '~s'", [lists:flatten( diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 7f6eaa8e93..5e8edd53a1 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -50,7 +50,7 @@ start() -> case catch action(Command, Args, RpcTimeout) of ok -> io:format("done.~n"), - init:stop(); + halt(); {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} -> error("invalid command '~s'", [lists:flatten( |