diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-12 13:53:10 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-12 13:53:10 +0100 |
| commit | c3b5f0e9404fb26695c779b18a754c1b1d16f8c4 (patch) | |
| tree | 2e3dad700a891682db1ac6831ed8a4efb60caa81 /src/rabbit.erl | |
| parent | a343eb68af4b46c10c3f6055ca940ae9a3de4d3d (diff) | |
| parent | 80931756a9ec0b45ed6a75ae5ce24e2ee4de4449 (diff) | |
| download | rabbitmq-server-git-c3b5f0e9404fb26695c779b18a754c1b1d16f8c4.tar.gz | |
Merge in default
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, |