summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2011-06-03 15:27:59 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2011-06-03 15:27:59 +0100
commitc906c9a2fb83beeb6de94576d640cefc1f9058b5 (patch)
tree66b2631953ed9a878216cc502682073173d4da6e /include
parent09da939e7c4dd3f6c145e02c6cf05551ae697f40 (diff)
parentc2475fe28fad0f55e32484bed76091476a419e3d (diff)
downloadrabbitmq-server-git-c906c9a2fb83beeb6de94576d640cefc1f9058b5.tar.gz
merge bug22953 into default
some minor tweaks and bug fixes to the broker needed by rabbitmq-federation: - make rabbit_binding:list_for_* usable in a transaction context - add rabbit_binding:peek_serial/1 to retrieve the exchange event serial w/o incrementing it - correct exchange type 'create' callback invocation in recover
Diffstat (limited to 'include')
-rw-r--r--include/rabbit_backing_queue_spec.hrl4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rabbit_backing_queue_spec.hrl b/include/rabbit_backing_queue_spec.hrl
index 1c2b94e267..295d90394f 100644
--- a/include/rabbit_backing_queue_spec.hrl
+++ b/include/rabbit_backing_queue_spec.hrl
@@ -32,8 +32,8 @@
-spec(stop/0 :: () -> 'ok').
-spec(init/4 :: (rabbit_types:amqqueue(), attempt_recovery(),
async_callback(), sync_callback()) -> state()).
--spec(terminate/1 :: (state()) -> state()).
--spec(delete_and_terminate/1 :: (state()) -> state()).
+-spec(terminate/2 :: (any(), state()) -> state()).
+-spec(delete_and_terminate/2 :: (any(), state()) -> state()).
-spec(purge/1 :: (state()) -> {purged_msg_count(), state()}).
-spec(publish/4 :: (rabbit_types:basic_message(),
rabbit_types:message_properties(), pid(), state()) ->