diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-06-11 12:28:23 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-06-11 12:28:23 +0200 |
| commit | 00efc6b4a38cb354d38a08e68297a74a515d5c98 (patch) | |
| tree | e8a1da2e939cbe7a877b093f74ce566b39a39a45 | |
| parent | 562a5bd1698fd0161d27741b52e988ddcfd437b5 (diff) | |
| parent | 7e3ec138816302652f00ef2e8d71876ee95bd262 (diff) | |
| download | rabbitmq-server-git-00efc6b4a38cb354d38a08e68297a74a515d5c98.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_control_main.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 5a0ce17441..822608f50e 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -478,7 +478,12 @@ action(eval, Node, [Expr], _Opts, _Inform) -> end; {error, E, _} -> {error_string, format_parse_error(E)} - end. + end; + +action(Command, Node, Args, Opts, Inform) -> + %% For backward compatibility, run commands accepting a timeout with + %% the default timeout. + action(Command, Node, Args, Opts, Inform, ?RPC_TIMEOUT). action(list_users, Node, [], _Opts, Inform, Timeout) -> Inform("Listing users", []), |