diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-23 20:22:01 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-23 20:22:01 +0100 |
commit | 1b65bc72c52faea5d7385491eae0de53b07d6dbe (patch) | |
tree | 8213ad2ea8d971bdcb5664d02b07e34580052729 | |
parent | f7fcf6aac62c93f73a95aea0e37f5b040e645fda (diff) | |
parent | d90d70371c5b5a9f54cb40bdcc3c48b34109bc34 (diff) | |
download | rabbitmq-server-1b65bc72c52faea5d7385491eae0de53b07d6dbe.tar.gz |
merge stable into default
-rw-r--r-- | src/gm.erl | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -711,13 +711,12 @@ handle_info({'DOWN', MRef, process, _Pid, Reason}, Member, GroupName, TxnFun)), handle_callback_result( case alive_view_members(View1) of - [Self] -> - {Result, State1} = maybe_erase_aliases(State, View1), - {Result, State1 #state { - members_state = blank_member_state(), - confirms = purge_confirms(Confirms) }}; - _ -> - change_view(View1, State) + [Self] -> maybe_erase_aliases( + State #state { + members_state = blank_member_state(), + confirms = purge_confirms(Confirms) }, + View1); + _ -> change_view(View1, State) end) end. |