summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2016-04-01 02:50:58 +0300
committerMichael Klishin <michael@clojurewerkz.org>2016-04-01 02:50:58 +0300
commit4b6faa788f7dd396f419e97e096e88e5de178982 (patch)
tree73e639043c170bece3ee7a4b9f79b0c7ec8954c4 /src
parent704a2b5b67dd2fe72c903899a995d455026b4578 (diff)
parentb99f96580c655821937e6046ad7240197f62d6ca (diff)
downloadrabbitmq-server-git-4b6faa788f7dd396f419e97e096e88e5de178982.tar.gz
Merge branch 'stable'
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_disk_monitor.erl2
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