diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-04-26 21:09:41 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-04-26 21:09:41 +0100 |
| commit | 40a5ea96100bc33ca209471e4ee331869fc36feb (patch) | |
| tree | 89335629864e971acf9bd93c8491ff209301ef04 /src | |
| parent | 5ac0dae17e7721fc18fdff31fae20fdeed7496d7 (diff) | |
| parent | 2863a4581e0032bd267f196c1ac3a73168f7f5bd (diff) | |
| download | rabbitmq-server-git-40a5ea96100bc33ca209471e4ee331869fc36feb.tar.gz | |
merge bug22616 into bug21673
Diffstat (limited to 'src')
| -rw-r--r-- | src/gen_server2.erl | 6 | ||||
| -rw-r--r-- | src/rabbit.erl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gen_server2.erl b/src/gen_server2.erl index c33582e30d..94a23fb90a 100644 --- a/src/gen_server2.erl +++ b/src/gen_server2.erl @@ -607,9 +607,9 @@ process_msg(Parent, Name, State, Mod, Time, TimeoutState, Queue, Debug, Msg) -> case Msg of {system, From, Req} -> - sys:handle_system_msg - (Req, From, Parent, ?MODULE, Debug, - [Name, State, Mod, Time, TimeoutState, Queue]); + sys:handle_system_msg( + Req, From, Parent, ?MODULE, Debug, + [Name, State, Mod, Time, TimeoutState, Queue]); %% gen_server puts Hib on the end as the 7th arg, but that %% version of the function seems not to be documented so %% leaving out for now. diff --git a/src/rabbit.erl b/src/rabbit.erl index c84d6de4cb..613382173b 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -98,7 +98,7 @@ {enables, core_initialized}]}). -rabbit_boot_step({rabbit_memory_monitor, - [{description, "memory moniter"}, + [{description, "memory monitor"}, {mfa, {rabbit_sup, start_restartable_child, [rabbit_memory_monitor]}}, {requires, rabbit_alarm}, |