summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2016-04-01 02:50:34 +0300
committerMichael Klishin <michael@novemberain.com>2016-04-01 02:50:34 +0300
commitb99f96580c655821937e6046ad7240197f62d6ca (patch)
tree49634a7af5af15f2d057517d7b69b7083672decd /src
parent5e56d9645536ca67fb2f6a23c289d6feaa9e1df3 (diff)
parent4f146b96fcbb27368bca4cbea793a42a774cee66 (diff)
downloadrabbitmq-server-git-b99f96580c655821937e6046ad7240197f62d6ca.tar.gz
Merge pull request #721 from rabbitmq/rabbitmq-server-717
Allow memory-relative disk-free limits greater than 1.0
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