summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2015-06-23 22:38:48 +0300
committerMichael Klishin <mklishin@pivotal.io>2015-06-23 22:38:48 +0300
commitae21a368a0cb15dd9cfebc88710f676c44270527 (patch)
tree15b150f6cabe1e6e923b32bafd08ab6dff9f92b3
parent6f6c491ff34004aa5da5c83c634f33055a95d4f8 (diff)
parenta09482a3aac1a293be1e4361d09e753789e29adc (diff)
downloadrabbitmq-server-git-ae21a368a0cb15dd9cfebc88710f676c44270527.tar.gz
Merge branch 'stable'
-rw-r--r--src/rabbit_backing_queue.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_backing_queue.erl b/src/rabbit_backing_queue.erl
index ba7cc4bfe9..a03bda13c9 100644
--- a/src/rabbit_backing_queue.erl
+++ b/src/rabbit_backing_queue.erl
@@ -252,7 +252,8 @@
behaviour_info(callbacks) ->
[{start, 1}, {stop, 0}, {init, 3}, {terminate, 2},
- {delete_and_terminate, 2}, {purge, 1}, {purge_acks, 1}, {publish, 6},
+ {delete_and_terminate, 2}, {delete_crashed, 1}, {purge, 1},
+ {purge_acks, 1}, {publish, 6},
{publish_delivered, 5}, {discard, 4}, {drain_confirmed, 1},
{dropwhile, 2}, {fetchwhile, 4}, {fetch, 2},
{drop, 2}, {ack, 2}, {requeue, 2}, {ackfold, 4}, {fold, 3}, {len, 1},