summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorMichael Bridgen <mikeb@lshift.net>2010-04-26 18:05:20 +0100
committerMichael Bridgen <mikeb@lshift.net>2010-04-26 18:05:20 +0100
commit843339a9d5b94264d157859cc57cc0cf8b3c60b3 (patch)
tree53c569cba68aaa20c3eaf2ffb12f56ce6544ae68 /packaging
parent12fa85e5c300c05bf3865fa7335223bf486ff2c8 (diff)
parentdd2c9913d29f9abfbcf82ab53ef5c388900e89bc (diff)
downloadrabbitmq-server-git-843339a9d5b94264d157859cc57cc0cf8b3c60b3.tar.gz
Merge default into amqp_0_9_1. There was a conflict in
rabbit_amqqueue.erl, due in the main to recover/0 being removed and refactoring of durable queue recovery in general.
Diffstat (limited to 'packaging')
0 files changed, 0 insertions, 0 deletions