summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>2015-11-20 10:31:48 +0100
committerJean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>2015-11-20 10:31:48 +0100
commit1eb029e4c62cbe88dab7465c5abf085b7ca202eb (patch)
tree7fe6dd9d582ce1c5e4eaabfcc198cc5937fb27ca
parent0cc8abef453086c58be7c6b16f1ae6c6e4d16749 (diff)
downloadrabbitmq-server-git-1eb029e4c62cbe88dab7465c5abf085b7ca202eb.tar.gz
Use erlang:min/2, not min/2 which is not available in Erlang R13B03
-rw-r--r--src/vm_memory_monitor.erl2
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).