summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-01-27 09:56:35 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-01-27 09:56:35 +0100
commit0a149c54d1ba57d309c00551791f2c3fb06723f7 (patch)
treef431cf74a0f9a6884bcdb31746c80fc15ff80146 /src
parent1a292318690bdbf3ee60d63c52045f1dabb4be8e (diff)
parent44cd71d1a4eefdb3607a01d183908aec6cffc8cb (diff)
downloadrabbitmq-server-git-0a149c54d1ba57d309c00551791f2c3fb06723f7.tar.gz
Merge branch 'stable'
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_mirror_queue_slave.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index 225c21dd54..9edb99c4d7 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -741,6 +741,7 @@ confirm_sender_death(Pid) ->
forget_sender(_, running) -> false;
forget_sender(down_from_gm, down_from_gm) -> false; %% [1]
+forget_sender(down_from_ch, down_from_ch) -> false;
forget_sender(Down1, Down2) when Down1 =/= Down2 -> true.
%% [1] If another slave goes through confirm_sender_death/1 before we