diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-09-18 15:32:17 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-09-18 15:32:17 +0100 |
| commit | a85d916b3444174f4fe1f43e61a65868728812db (patch) | |
| tree | 31241a5d30c1b3b8437b3d4e88571d4e5b86beeb /src | |
| parent | e5dba16610aa66242aa9dff731972fee1c9a815a (diff) | |
| parent | 16b36d1e63389efc52fb051ac0ae61b4bf7f0ec6 (diff) | |
| download | rabbitmq-server-git-a85d916b3444174f4fe1f43e61a65868728812db.tar.gz | |
Merge heads
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index d48dc43795..0fb37d79f3 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -534,10 +534,10 @@ init_db_and_upgrade(ClusterNodes, NodeType, CheckOtherNodes) -> %% `maybe_upgrade_local' restarts mnesia, so ram nodes will forget %% about the cluster case NodeType of - disc -> start_mnesia(), + ram -> start_mnesia(), change_extra_db_nodes(ClusterNodes, false), wait_for_replicated_tables(); - ram -> ok + disc -> ok end, ok. |