diff options
| author | Dan Gudmundsson <[email protected]> | 2013-11-29 09:58:26 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-11-29 09:58:26 +0100 |
| commit | 423d37395076528866c4b689c0f1e9b72dae58e1 (patch) | |
| tree | b7e8a58df2c8c380d10e275102c07fa737d24908 /lib/mnesia/src/mnesia_monitor.erl | |
| parent | a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb (diff) | |
| parent | 0279799e4f3d2404f657863d04d8c1d6f6c08985 (diff) | |
| download | otp-423d37395076528866c4b689c0f1e9b72dae58e1.tar.gz otp-423d37395076528866c4b689c0f1e9b72dae58e1.tar.bz2 otp-423d37395076528866c4b689c0f1e9b72dae58e1.zip | |
Merge branch 'maint'
Conflicts:
erts/etc/win32/Install.c
Diffstat (limited to 'lib/mnesia/src/mnesia_monitor.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_monitor.erl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl index 7f6b56aef0..c7b905a1bf 100644 --- a/lib/mnesia/src/mnesia_monitor.erl +++ b/lib/mnesia/src/mnesia_monitor.erl @@ -482,11 +482,7 @@ handle_cast({mnesia_down, mnesia_controller, Node}, State) -> mnesia_tm:mnesia_down(Node), {noreply, State}; -handle_cast({mnesia_down, mnesia_tm, {Node, Pending}}, State) -> - mnesia_locker:mnesia_down(Node, Pending), - {noreply, State}; - -handle_cast({mnesia_down, mnesia_locker, Node}, State) -> +handle_cast({mnesia_down, mnesia_tm, Node}, State) -> Down = {mnesia_down, Node}, mnesia_lib:report_system_event(Down), GoingDown = lists:delete(Node, State#state.going_down), |