summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-05-31 15:12:37 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2013-05-31 15:12:37 +0100
commit77b9dc8f07935f5fe474a549f635f1b055f1d74c (patch)
tree0b55f82a10b9303d114ebfb46f0c2fa3fbba7c95 /src/rabbit.erl
parent38380258b363e7e345c997302fb9fd08d953be63 (diff)
parent783ebdf23d2f791aad5d78740dfff3f643353644 (diff)
downloadrabbitmq-server-git-77b9dc8f07935f5fe474a549f635f1b055f1d74c.tar.gz
merge bug25571 into stable
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 37ed5ae0a7..450a7f32d0 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -393,7 +393,7 @@ await_startup() ->
status() ->
S1 = [{pid, list_to_integer(os:getpid())},
- {running_applications, catch application:which_applications()},
+ {running_applications, rabbit_misc:which_applications()},
{os, os:type()},
{erlang_version, erlang:system_info(system_version)},
{memory, rabbit_vm:memory()}],