diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-22 19:09:50 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-22 19:09:50 +0100 |
| commit | de6383d100e02428e3abbdd44ead89ce9bf6e013 (patch) | |
| tree | 830b1b019f88ecb36b042397d650f165bfa0c305 | |
| parent | bbf2de0254c8db4236845e8a6d4e2cb651cdd88e (diff) | |
| parent | 375ac259f413bd82bb9fd401e36225551a219777 (diff) | |
| download | rabbitmq-server-git-de6383d100e02428e3abbdd44ead89ce9bf6e013.tar.gz | |
merge stable into default
| -rw-r--r-- | src/rabbit_dead_letter.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rabbit_dead_letter.erl b/src/rabbit_dead_letter.erl index ec32e6878d..728bc43117 100644 --- a/src/rabbit_dead_letter.erl +++ b/src/rabbit_dead_letter.erl @@ -129,6 +129,9 @@ is_cycle(Queue, Deaths) -> {longstr, <<"rejected">>} =/= rabbit_misc:table_lookup(D, <<"reason">>); (_) -> + %% There was something we didn't expect, therefore + %% a client must have put it there, therefore the + %% cycle was not "fully automatic". false end, Cycle ++ [H]) end. |