summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable'Jean-Sébastien Pédron2016-06-151-3/+1
|\
| * priority_queue_SUITE: Use the new open_connection_and_channel() helperJean-Sébastien Pédron2016-06-151-3/+1
* | Merge branch 'stable'Michael Klishin2016-06-151-3/+5
|\ \ | |/
| * Merge pull request #843 from rabbitmq/rabbitmq-server-837Michael Klishin2016-06-151-3/+5
| |\
| | * Unused constDaniil Fedotov2016-06-141-2/+0
| | * Do not run on_node_downDaniil Fedotov2016-06-141-25/+1
| | * Move cleanup to prep_stopDaniil Fedotov2016-06-131-3/+31
* | | Merge branch 'stable'Michael Klishin2016-06-142-7/+52
|\ \ \ | |/ /
| * | Merge branch 'rabbitmq-server-687' into stableMichael Klishin2016-06-142-7/+52
| |\ \ | | |/ | |/|
| | * Add tests for order of messages within each priority queueDiana Corbacho2016-06-141-3/+43
| | * Restore original order in batch publish messagesDiana Corbacho2016-06-141-4/+9
| |/
* | Merge branch 'stable'Diana Corbacho2016-06-091-1/+5
|\ \ | |/
| * Merge pull request #835 from rabbitmq/rabbitmq-server-834D Corbacho2016-06-091-1/+5
| |\
| | * SimplifyMichael Klishin2016-06-091-1/+1
| | * Significantly bump max restarts intensity for worker_pool_sup, fixes #834Michael Klishin2016-06-091-1/+5
* | | Merge branch 'stable'Michael Klishin2016-06-091-2/+2
|\ \ \ | |/ /
| * | Correct doc typoMichael Klishin2016-06-091-2/+2
* | | Merge branch 'stable'Michael Klishin2016-06-081-7/+7
|\ \ \ | |/ /
| * | Merge pull request #831 from binarin/rabbitmq-server-ocf-bashismsMichael Klishin2016-06-081-7/+7
| |\ \ | | |/ | |/|
| | * Fix bashisms in OCF HA scriptAlexey Lebedeff2016-06-081-7/+7
| |/
* | Merge branch 'stable'Michael Klishin2016-06-082-6/+14
|\ \ | |/
| * Extract rabbit_mirror_queue_misc:sync_queue/1 and cancel_sync_queue/1Michael Klishin2016-06-082-6/+14
* | Merge branch 'stable'Michael Klishin2016-06-083-61/+73
|\ \ | |/
| * Merge branch 'rabbitmq-server-828' into stableMichael Klishin2016-06-083-61/+73
| |\
| | * Performance improvements on file_handle_cacheDiana Corbacho2016-06-073-61/+73
* | | Merge branch 'stable'Michael Klishin2016-06-072-7/+56
|\ \ \ | |/ /
| * | Merge pull request #827 from rabbitmq/rabbitmq-management-219Michael Klishin2016-06-071-4/+16
| |\ \
| | * | ETS tables memory consumption infoDaniil Fedotov2016-06-071-4/+16
| |/ /
| * | Merge pull request #819 from binarin/rabbitmq-server-ocf-cluster-statusMichael Klishin2016-06-071-3/+40
| |\ \
| | * | Check cluster_status liveness during OCF checksAlexey Lebedeff2016-06-031-3/+40
* | | | Merge branch 'stable'Michael Klishin2016-06-060-0/+0
|\ \ \ \ | |/ / /
| * | | Stop match earlier, and added some commentsrabbitmq_v3_6_3_milestone1sylvainhubsch2016-06-061-0/+10
| * | | Compare values only on headers matchsylvainhubsch2016-06-061-10/+0
| * | | Match on types deleted and shortcuts algosylvainhubsch2016-06-061-18/+34
* | | | Merge branch 'rabbitmq-server-760'Michael Klishin2016-06-061-18/+34
|\ \ \ \
| * \ \ \ Merge branch 'rabbitmq-server-xh-notypeandshortcuts' of https://github.com/sy...sylvainhubsch2016-06-050-0/+0
| |\ \ \ \
| | * | | | Match on types deleted and shortcuts algosylvainhubsch2016-04-181-18/+34
| * | | | | Merge remote-tracking branch 'upstream/master' into rabbitmq-server-xh-notype...sylvainhubsch2016-06-05107-698/+17011
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'stable'Michael Klishin2016-06-051-0/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Docs correctionMichael Klishin2016-06-051-4/+4
* | | | | | Merge branch 'stable'Michael Klishin2016-06-052-2/+36
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Brief docs for rabbit_amqqueue_process state recordMichael Klishin2016-06-051-1/+33
| * | | | | Merge pull request #822 from rabbitmq/rabbitmq-server-820Daniil Fedotov2016-06-031-1/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fixes #820.Michael Klishin2016-06-031-1/+3
| |/ / / /
* | | | | Merge pull request #754 from rabbitmq/rabbitmq-delayed-message-exchange-3Michael Klishin2016-06-026-3/+29
|\ \ \ \ \
| * | | | | Squash a warningMichael Klishin2016-06-021-1/+1
| * | | | | Merge branch 'master' into rabbitmq-delayed-message-exchange-3Michael Klishin2016-06-0277-521/+16731
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'stable'Jean-Sébastien Pédron2016-06-021-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | unit_inbroker_SUITE: Give one hour for the backing queue testsJean-Sébastien Pédron2016-06-021-0/+8
* | | | | | Merge branch 'stable'Michael Klishin2016-06-011-0/+1
|\ \ \ \ \ \ | |/ / / / /