summaryrefslogtreecommitdiff
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
commit137c0553856888469b992df0ca537249bdb44c84 (patch)
tree102a91134d6581c197b099f7430b0f9c2dc2eb91
parent3fc13012637011e0565b2eb7e782d209512a5906 (diff)
parent9831244a15300db4f7d22063f100be37675034b2 (diff)
downloadrabbitmq-server-137c0553856888469b992df0ca537249bdb44c84.tar.gz
Merge bug 24136.
-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 e58e67ad..d029ff1d 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