diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-03-24 12:18:18 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-03-24 12:18:18 +0000 |
| commit | 9329a7b0d3d8f185b8e792c1621536df4ef526c3 (patch) | |
| tree | 765f675c386628db11cfbe806a6b62350906fac0 /src | |
| parent | f3d1c1f364da19e5c9bdbe7efeb5e326bb18f1ef (diff) | |
| parent | b2de145777065528fa258cef162f44ae29d54d33 (diff) | |
| download | rabbitmq-server-git-9329a7b0d3d8f185b8e792c1621536df4ef526c3.tar.gz | |
Merging default into bug 22550
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 3ba150cb72..f2f291692a 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -46,6 +46,7 @@ -spec(stop/0 :: () -> 'ok'). -spec(action/4 :: (atom(), erlang_node(), [string()], fun ((string(), [any()]) -> 'ok')) -> 'ok'). +-spec(usage/0 :: () -> no_return()). -endif. @@ -129,7 +130,7 @@ parse_args([], _) -> stop() -> ok. -usage() -> +usage() -> rabbit_ctl_usage:usage(). action(stop, Node, [], Inform) -> diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 7b09a91d91..9ff2c5cb11 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -42,6 +42,7 @@ -spec(start/0 :: () -> no_return()). -spec(stop/0 :: () -> 'ok'). +-spec(usage/0 :: () -> no_return()). -endif. @@ -85,7 +86,7 @@ parse_args([Command | Args]) -> stop() -> ok. -usage() -> +usage() -> rabbit_multi_usage:usage(). action(start_all, [NodeCount], RpcTimeout) -> |