diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-16 12:24:08 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-16 12:24:08 +0100 |
| commit | bf30a77325d614eab5ea1964c8d2536c7f7c947f (patch) | |
| tree | a0395ef3d301f6bc2bf9101698ec22d241afc18e /src/rabbit.erl | |
| parent | 62dc3ebde75180415710d216b3bd16680b6bae2b (diff) | |
| parent | 811f35ceeac31ab66e8c57bb0962b97c2209896c (diff) | |
| download | rabbitmq-server-git-bf30a77325d614eab5ea1964c8d2536c7f7c947f.tar.gz | |
merge default into bug25202
...and in the process inline mq_slave:forget_slave and fix a bug in it
(it was looking at the wrong element of the tuple)
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 7b417b00c6..93808f8413 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -364,7 +364,7 @@ status() -> {running_applications, application:which_applications(infinity)}, {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, - {memory, erlang:memory()}], + {memory, rabbit_vm:memory()}], S2 = rabbit_misc:filter_exit_map( fun ({Key, {M, F, A}}) -> {Key, erlang:apply(M, F, A)} end, [{vm_memory_high_watermark, {vm_memory_monitor, |