diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2009-01-14 07:42:15 +0000 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2009-01-14 07:42:15 +0000 |
| commit | 148f266ab03fd1b84a556df064cb5ff5cc0883ae (patch) | |
| tree | 6bb6b0dafdff8342fa77f0708673f795cb883fd5 | |
| parent | c9810e7c273ccb9347829b99f1a3e690aea0506b (diff) | |
| parent | e5a9c80432e749a36bd5d20c63fa195ec5747050 (diff) | |
| download | rabbitmq-server-148f266ab03fd1b84a556df064cb5ff5cc0883ae.tar.gz | |
Merged 20141 into default
| -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 1e07f6d2..cbc11b40 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 7f6eaa8e..5e8edd53 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( |