summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorArnaud Cogoluègnes <acogoluegnes@gmail.com>2018-12-14 18:23:21 +0100
committerArnaud Cogoluègnes <acogoluegnes@gmail.com>2018-12-14 18:23:21 +0100
commit1f052db8900e388535249603c28e44ee3e40a607 (patch)
tree99ea50e7b4323dcae15b1302cbe7c58aa8b014bf /docs
parentb4d354546d44799f9cdab979c02eecb4245e67ad (diff)
parentbc662bc0a807f5b0ad0681fb2bcf49534f93729c (diff)
downloadrabbitmq-server-git-1f052db8900e388535249603c28e44ee3e40a607.tar.gz
Merge branch 'master' into rabbitmq-server-1799-single-active-consumer-in-qq
Conflicts: src/rabbit_fifo.erl src/rabbit_quorum_queue.erl
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions