summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2015-06-18 23:48:43 +0300
committerMichael Klishin <mklishin@pivotal.io>2015-06-18 23:48:43 +0300
commited66857f1f61dac4e01fef67ea3ebac00989f0bd (patch)
treef4926675d06f521802441699694bf7b5558e5dc7
parentf0931b7dcca40e366e8272dfa403cc52493ec9b3 (diff)
parent677bb64ffd177f72d6131a8a6202b7c8a4ff6f24 (diff)
downloadrabbitmq-server-git-ed66857f1f61dac4e01fef67ea3ebac00989f0bd.tar.gz
Merge branch 'stable'
-rw-r--r--src/rabbit_control_main.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index 822608f50e..71d0e03130 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -519,6 +519,9 @@ action(list_vhosts, Node, Args, _Opts, Inform, Timeout) ->
display_info_list(call(Node, {rabbit_vhost, info_all, []}, Timeout),
ArgAtoms);
+action(list_user_permissions, _Node, _Args = [], _Opts, _Inform, _Timeout) ->
+ {error_string,
+ "list_user_permissions expects a username argument, but none provided."};
action(list_user_permissions, Node, Args = [_Username], _Opts, Inform, Timeout) ->
Inform("Listing permissions for user ~p", Args),
display_info_list(call(Node, {rabbit_auth_backend_internal,