summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-05-25 17:37:47 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-05-25 17:37:47 +0100
commit4c3b56b7be499d5ad3570c56c6fca6048a8cfdeb (patch)
tree102a91134d6581c197b099f7430b0f9c2dc2eb91 /src
parent3ab92151948c0c546cbefe5902efbd92acd14280 (diff)
parentdca647b79fe6b4132b8236777686b1ded90631d5 (diff)
downloadrabbitmq-server-git-4c3b56b7be499d5ad3570c56c6fca6048a8cfdeb.tar.gz
Merge bug 24136.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_amqqueue.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index e58e67ad99..d029ff1d36 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -292,7 +292,7 @@ with_exclusive_access_or_die(Name, ReaderPid, F) ->
assert_args_equivalence(#amqqueue{name = QueueName, arguments = Args},
RequiredArgs) ->
rabbit_misc:assert_args_equivalence(Args, RequiredArgs, QueueName,
- [<<"x-expires">>]).
+ [<<"x-expires">>, <<"x-message-ttl">>]).
check_declare_arguments(QueueName, Args) ->
[case Fun(rabbit_misc:table_lookup(Args, Key)) of