Merge branch 'stable'

1 files changed, 5 insertions, 3 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index d62a4b6935..4969f8a7d4 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -22,7 +22,7 @@
          stop_and_halt/0, await_startup/0, status/0, is_running/0,
          is_running/1, environment/0, rotate_logs/0, force_event_refresh/1,
          start_fhc/0]).
--export([start/2, stop/1]).
+-export([start/2, stop/1, prep_stop/1]).
 -export([start_apps/1, stop_apps/1]).
 -export([log_locations/0, config_files/0]). %% for testing and mgmt-agent
 
@@ -614,14 +614,16 @@ start(normal, []) ->
             Error
     end.
 
-stop(_State) ->
+prep_stop(_State) ->
     ok = rabbit_alarm:stop(),
     ok = case rabbit_mnesia:is_clustered() of
-             true  -> rabbit_amqqueue:on_node_down(node());
+             true  -> ok;
              false -> rabbit_table:clear_ram_only_tables()
          end,
     ok.
 
+stop(_) -> ok.
+
 -ifdef(use_specs).
 -spec(boot_error/2 :: (atom(), term()) -> no_return()).
 -endif.