summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2017-07-10 07:22:24 -0700
committerMichael Klishin <michael@clojurewerkz.org>2017-07-10 07:22:24 -0700
commit6a77b6dbebd49c0c4205d3debaa14eb8db0debb2 (patch)
tree8f360734ff670d2a68fe340fe001b750d4a54533 /src
parent3afc67b465be39cddf6dc992cb3f448d11e9c746 (diff)
parent39c1bd19965dc31688413afad8cb13c454346a57 (diff)
downloadrabbitmq-server-git-6a77b6dbebd49c0c4205d3debaa14eb8db0debb2.tar.gz
Merge branch 'stable' into rabbitmq-management-427
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_control_main.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index dc2d43d05e..50cf832e5d 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -123,7 +123,8 @@
[stop, shutdown, stop_app, start_app, wait, reset, force_reset, rotate_logs,
join_cluster, change_cluster_node_type, update_cluster_nodes,
forget_cluster_node, rename_cluster_node, cluster_status, status,
- environment, eval, force_boot, help, hipe_compile, encode]).
+ environment, eval, force_boot, help, hipe_compile, encode, decode,
+ list_ciphers, list_hashes]).
%% [Command | {Command, DefaultTimeoutInMilliSeconds}]
-define(COMMANDS_WITH_TIMEOUT,