diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-04-03 07:45:44 -0700 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-04-03 07:45:44 -0700 |
| commit | c5e029bcc30df26417c65688e5f2fd32b74a3d73 (patch) | |
| tree | 8f86472c39098ac57b9bbaa227e38cee60b2424b /src | |
| parent | 11fa86d24ac8ddafb3e642aeba4e1b4fc45adea6 (diff) | |
| parent | 13635aa794b6f29894501d725341b58c882656e5 (diff) | |
| download | rabbitmq-server-git-c5e029bcc30df26417c65688e5f2fd32b74a3d73.tar.gz | |
Merge branch 'master' into rabbitmq-server-691
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_disk_monitor.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl index 124306487e..88a8096fd4 100644 --- a/src/rabbit_disk_monitor.erl +++ b/src/rabbit_disk_monitor.erl @@ -235,7 +235,7 @@ parse_free_win32(CommandResult) -> list_to_integer(lists:reverse(Free)). interpret_limit({mem_relative, Relative}) - when is_float(Relative), Relative < 1 -> + when is_float(Relative) -> round(Relative * vm_memory_monitor:get_total_memory()); interpret_limit(Absolute) -> case rabbit_resource_monitor_misc:parse_information_unit(Absolute) of |