diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-09-18 16:03:00 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-09-18 16:03:00 +0100 |
| commit | 2e74276bffccb0156eadbcdf7d90b1bcdf95a432 (patch) | |
| tree | eb877523349c074e6ebccc1e8b91b7a99bc72811 /src | |
| parent | af518c9a07917831fab0e76c82465f58a2455195 (diff) | |
| parent | b2000dae4e222fa0a4c219fcfc04848559d72d0a (diff) | |
| download | rabbitmq-server-git-2e74276bffccb0156eadbcdf7d90b1bcdf95a432.tar.gz | |
Merge heads
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_upgrade.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index 2b591c2ed4..9c54eb7247 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -66,11 +66,11 @@ %% into the boot process by prelaunch before the mnesia application is %% started. By the time Mnesia is started the upgrades have happened %% (on the primary), or Mnesia has been reset (on the secondary) and -%% rabbit_mnesia:init_db/3 can then make the node rejoin the cluster +%% rabbit_mnesia:init_db_unchecked/2 can then make the node rejoin the cluster %% in the normal way. %% %% The non-mnesia upgrades are then triggered by -%% rabbit_mnesia:init_db/3. Of course, it's possible for a given +%% rabbit_mnesia:init_db_unchecked/2. Of course, it's possible for a given %% upgrade process to only require Mnesia upgrades, or only require %% non-Mnesia upgrades. In the latter case no Mnesia resets and %% reclusterings occur. |