summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-08-28 13:54:49 +0100
committerMatthias Radestock <matthias@lshift.net>2009-08-28 13:54:49 +0100
commitca2cdcefc6a1b746a16449d5a461077da74dbb1c (patch)
treea451476e2625a729f6507a4a18ae46f4fe21ac1e
parent5e94e927664a88c828bec8ac9d8af65f24d2a937 (diff)
parent8b1d8f2b093ee4d76a0e18371befb1b4fe6d795d (diff)
downloadrabbitmq-server-git-ca2cdcefc6a1b746a16449d5a461077da74dbb1c.tar.gz
merge heads
-rw-r--r--src/rabbit_memory_manager.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_memory_manager.erl b/src/rabbit_memory_manager.erl
index 68cfd4cec0..2fb593e916 100644
--- a/src/rabbit_memory_manager.erl
+++ b/src/rabbit_memory_manager.erl
@@ -183,7 +183,7 @@ handle_call(info, _From, State) ->
processes = Procs,
hibernate = Sleepy,
unoppressable = Unoppressable } =
- free_upto(undef, 1 + ?TOTAL_TOKENS, State), %% this'll just do tidying
+ free_upto(undefined, 1 + ?TOTAL_TOKENS, State), %% just tidy
{reply, [{ available_tokens, Avail },
{ processes, dict:to_list(Procs) },
{ hibernated_processes, queue:to_list(Sleepy) },