summaryrefslogtreecommitdiff
path: root/src/rabbit_amqqueue.erl
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-09-11 14:57:44 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2013-09-11 14:57:44 +0100
commitecfd2b2f60ad2e5802a5d533234ab28b13cc7bd3 (patch)
treedc08807d145ee95e32809e40e0349a36e075eae2 /src/rabbit_amqqueue.erl
parentf149982c195173fbee56e23be8fa975d24d143fa (diff)
parent9affd59cdf7f2dcebcddfdf614bcc0da7d7e7fbd (diff)
downloadrabbitmq-server-ecfd2b2f60ad2e5802a5d533234ab28b13cc7bd3.tar.gz
merge stable into default
Diffstat (limited to 'src/rabbit_amqqueue.erl')
-rw-r--r--src/rabbit_amqqueue.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 38d72479..65e42383 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -72,8 +72,8 @@
-spec(declare/5 ::
(name(), boolean(), boolean(),
rabbit_framing:amqp_table(), rabbit_types:maybe(pid()))
- -> {'new' | 'existing' | 'absent', rabbit_types:amqqueue()} |
- rabbit_types:channel_exit()).
+ -> {'new' | 'existing' | 'absent' | 'owner_died',
+ rabbit_types:amqqueue()} | rabbit_types:channel_exit()).
-spec(internal_declare/2 ::
(rabbit_types:amqqueue(), boolean())
-> queue_or_absent() | rabbit_misc:thunk(queue_or_absent())).