diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-11-20 12:00:15 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-11-20 12:00:15 +0100 |
| commit | b44626cae3be4635b0147d8a8f8101d5a77497fe (patch) | |
| tree | 1f2768e3c9be6aebaa2667e7a7eadfebc4909d48 | |
| parent | 7c99d99281d29e8836d038e19bf198fc25396e0e (diff) | |
| parent | 1eb029e4c62cbe88dab7465c5abf085b7ca202eb (diff) | |
| download | rabbitmq-server-git-b44626cae3be4635b0147d8a8f8101d5a77497fe.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/vm_memory_monitor.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index fe68f50239..508153969e 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -217,7 +217,7 @@ set_mem_limits(State, MemLimit) -> interpret_limit({'absolute', MemLim}, UsableMemory) -> %% Absolute memory is provided in MB - min(MemLim * ?ONE_MB, UsableMemory); + erlang:min(MemLim * ?ONE_MB, UsableMemory); interpret_limit(MemFraction, UsableMemory) -> trunc(MemFraction * UsableMemory). |