summaryrefslogtreecommitdiff
path: root/scripts/rabbitmqctl
diff options
context:
space:
mode:
authorMichael Bridgen <mikeb@lshift.net>2009-11-24 11:24:43 +0000
committerMichael Bridgen <mikeb@lshift.net>2009-11-24 11:24:43 +0000
commiteab18481fa7c4790fa435af97a9c487204820ebf (patch)
tree8e08f312836efd951be7a6f44b300ddfb129a51a /scripts/rabbitmqctl
parent210421063e374da609a5e00c21d555439cf17b8d (diff)
parent1022dc07a5ef997eb40efe8d0ec00cf2621b244f (diff)
downloadrabbitmq-server-git-eab18481fa7c4790fa435af97a9c487204820ebf.tar.gz
Merge default in. This includes bug22020. There were some
non-obvious conflict resolutions: - getting rid of the q/x durability agreement check - in getting rid of the exchange may_auto_deleting, making sure all branches returned 'ok' (the tests all start failing!).
Diffstat (limited to 'scripts/rabbitmqctl')
0 files changed, 0 insertions, 0 deletions