summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |/ / / /
| * | | | Include rabbitmq_jms_topic_exchange into RabbitMQ distributionMichael Klishin2016-06-011-0/+1
* | | | | Merge branch 'stable'Jean-Sébastien Pédron2016-05-310-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Backport the use of rabbitmq-build.mk from masterJean-Sébastien Pédron2016-05-311-9/+2
* | | | | config_schema_SUITE: Copy Cuttlefish schema in the testsuite data directoryJean-Sébastien Pédron2016-05-3014-24/+1941
* | | | | Merge pull request #814 from rabbitmq/rabbitmq-server-803Michael Klishin2016-05-306-33/+204
|\ \ \ \ \
| * | | | | Upgrade amqqueue record with policy_versionDiana Corbacho2016-05-271-0/+19
| * | | | | Check return value of clear_policy in the test instead of auxiliary functionDiana Corbacho2016-05-271-4/+4
| * | | | | Test concurrent application of HA policiesDiana Corbacho2016-05-272-2/+111
| * | | | | Update policy version on set_policy and use it on update_mirroringGabriele Santomaggio2016-05-272-7/+14
| * | | | | Take update mirroring decision in rabbit_amqqueue_processDiana Corbacho2016-05-272-25/+61
* | | | | | Merge branch 'stable'Michael Klishin2016-05-291-0/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update rabbitmq-components.mkMichael Klishin2016-05-291-0/+4
| * | | | | Update CONTRIBUTING.md, add CODE_OF_CONDUCT.mdMichael Klishin2016-05-282-15/+46
* | | | | | Update CONTRIBUTING.md, add CODE_OF_CONDUCT.mdMichael Klishin2016-05-282-15/+46
* | | | | | Lager extra sinks are renamed to `rabbit_log_*`Jean-Sébastien Pédron2016-05-271-6/+6
* | | | | | Merge branch 'stable'Michael Klishin2016-05-271-0/+1
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Include rabbitmq_trust_store into RabbitMQ distributionMichael Klishin2016-05-271-0/+1
* | | | | Makefile: Add several plugins to TEST_DEPSJean-Sébastien Pédron2016-05-271-0/+13
* | | | | Switch testsuite to common_test, part #4Jean-Sébastien Pédron2016-05-2712-151/+1316
* | | | | Merge branch 'stable'Jean-Sébastien Pédron2016-05-2734-337/+13080
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'rabbitmq-server-725' into stableJean-Sébastien Pédron2016-05-2734-333/+13080
| |\ \ \ \
| | * | | | Switch testsuite to common_test, part #3Jean-Sébastien Pédron2016-05-2719-0/+7298
| | * | | | Switch testsuite to common_test, part #2Jean-Sébastien Pédron2016-05-276-150/+4318
| | * | | | Update erlang.mkJean-Sébastien Pédron2016-05-272-248/+290
| | * | | | Makefile: Add amqp_client and meck to TEST_DEPSJean-Sébastien Pédron2016-05-271-1/+1
| | * | | | Makefile: Remove rabbitmq_test as a TEST_DEPSJean-Sébastien Pédron2016-05-271-0/+3
| | * | | | Squash several small testsuites in unit_SUITE and unit_inbroker_SUITEJean-Sébastien Pédron2016-05-279-503/+404
| | * | | | Switch testsuite to common_test, part #1Jean-Sébastien Pédron2016-05-2714-71/+1342
| | * | | | rabbit_ct_broker_helpers: New helpers specific to the broker testsuiteJean-Sébastien Pédron2016-05-271-0/+78
| | * | | | make tests: Do not run tests from rabbitmq-testJean-Sébastien Pédron2016-05-271-14/+0
| |/ / / /