diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-11-11 16:47:37 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-11-11 16:47:37 +0000 |
| commit | fcaf98d936b4ec1889d90964f37e887edda7e14d (patch) | |
| tree | e3bafe718741223054954007a7fbdbc503bc2922 /src/rabbit.erl | |
| parent | 33e51bc4ed2198870c05e2506e11a85fc1279ce8 (diff) | |
| parent | 979ccce8aecdbe8ca99fe2d3f11ab9bf7ce68ef4 (diff) | |
| download | rabbitmq-server-git-fcaf98d936b4ec1889d90964f37e887edda7e14d.tar.gz | |
merging in from bug 21742, ignoring all of its changes to amqqueue and amqqueue_process
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index eb3de1d398..1c5a07c7b9 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -155,8 +155,9 @@ start(normal, []) -> ok = rabbit_amqqueue:start(), ok = start_child(rabbit_router), + ok = start_child(rabbit_guid), ok = start_child(rabbit_node_monitor), - ok = start_child(rabbit_guid) + ok = start_child(rabbit_memory_monitor) end}, {"recovery", fun () -> |