summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable'Michael Klishin2016-07-081-2/+1
|\
| * Merge pull request #877 from rabbitmq/rabbitmq-management-244Michael Klishin2016-07-081-2/+1
| |\
| | * Use rabbit_misc to parse GC stats, supporting maps in R19Diana Corbacho2016-07-071-2/+1
| |/
* | Merge branch 'stable'Michael Klishin2016-07-072-0/+9
|\ \ | |/
| * Commit Debian and RPM change logsMichael Klishin2016-07-062-0/+9
* | Only use new non-builtin types in masterJean-Sébastien Pédron2016-07-068-24/+22
* | Merge branch 'stable'Jean-Sébastien Pédron2016-07-051-4/+4
|\ \ | |/
| * Fix testsuite build on Erlang R16B03 by using macros for old builtin typesrabbitmq_v3_6_3Jean-Sébastien Pédron2016-07-051-4/+4
* | Merge branch 'stable'Jean-Sébastien Pédron2016-07-059-22/+23
|\ \ | |/
| * Travis CI: Do not set CT_OPTS, it's handled by rabbitmq-build.mkJean-Sébastien Pédron2016-07-051-1/+1
| * Use CT_OPTS from rabbitmq-build.mkJean-Sébastien Pédron2016-07-051-2/+0
| * Travis CI: Turn off error_logger messagesJean-Sébastien Pédron2016-07-051-1/+1
| * Travis CI: Test against Erlang 18.3 and 19.0Jean-Sébastien Pédron2016-07-051-1/+2
| * Fix build on Erlang R16B03 by using macros for old builtin typesJean-Sébastien Pédron2016-07-057-19/+21
* | Merge branch 'stable'rabbitmq_v3_7_0_milestone5Michael Klishin2016-07-031-8/+4
|\ \ | |/
| * These are moved to rabbit_ct_broker_helpersrabbitmq_v3_6_3_rc3Michael Klishin2016-07-031-4/+2
| * {allow,block}_traffic_between/2 are moved to rabbit_ct_broker_helpersMichael Klishin2016-07-031-4/+2
* | Merge branch 'stable'Michael Klishin2016-07-030-0/+0
|\ \ | |/
| * dist_proxy helpers moved to rabbit_ct_broker_helpersMichael Klishin2016-07-031-27/+6
* | dist_proxy helpers moved to rabbit_ct_broker_helpersMichael Klishin2016-07-031-27/+6
* | Merge branch 'stable'Michael Klishin2016-07-012-13/+19
|\ \ | |/
| * Travis CI: Use "if/then" instead of "cmd && cmd" for conditional stepsJean-Sébastien Pédron2016-07-011-2/+2
| * Travis CI: Fix the `$GROUP` env. var. matrixJean-Sébastien Pédron2016-07-011-2/+2
| * Travis CI: And fix another syntax error...Jean-Sébastien Pédron2016-07-011-1/+1
| * Travis CI: Fix stupid syntax errorJean-Sébastien Pédron2016-07-011-1/+1
| * Hardcode init-system-helpers dependency to be Ubuntu 14.04 (or later)-compatibleMichael Klishin2016-07-011-1/+1
| * Update Uploaders listMichael Klishin2016-07-011-4/+3
| * Travis CI: Lower verbosity of common_testJean-Sébastien Pédron2016-07-011-1/+1
| * Travis CI: Import Git branch handdling from rabbitmq-shovelJean-Sébastien Pédron2016-07-011-5/+12
* | Use `rand` directly in master because we require Erlang 18.3Jean-Sébastien Pédron2016-06-302-2/+2
* | Merge branch 'stable'Michael Klishin2016-06-302-3/+7
|\ \ | |/
| * Merge pull request #866 from rabbitmq/rabbitmq-management-825rabbitmq_v3_6_3_rc2Michael Klishin2016-06-302-3/+7
| |\
| | * Include metrics for the time it takes to obtain a file handleDiana Corbacho2016-06-302-3/+7
| |/
* | Merge branch 'stable'Michael Klishin2016-06-291-1/+9
|\ \ | |/
| * Merge pull request #858 from rabbitmq/rabbitmq-management-211Michael Klishin2016-06-291-1/+9
| |\
| | * Report reductions and garbage collection options in queue processesDiana Corbacho2016-06-291-1/+9
* | | Use `rand` directly in master because we require Erlang 18.3Jean-Sébastien Pédron2016-06-296-6/+6
* | | Merge branch 'stable'Jean-Sébastien Pédron2016-06-2987-1319/+985
|\ \ \ | |/ /
| * | Merge pull request #861 from rabbitmq/rabbitmq-server-860Michael Klishin2016-06-2987-1298/+957
| |\ \
| | * \ Merge branch 'stable' into rabbitmq-server-860Michael Klishin2016-06-281-0/+1
| | |\ \ | | |/ / | |/| |
| * | | Ignore debug/*Michael Klishin2016-06-281-0/+1
| | * | Use the new `rand_compat` module to transition from `random` to `rand`Jean-Sébastien Pédron2016-06-288-17/+8
| | * | Use the new -spec formatJean-Sébastien Pédron2016-06-2883-1281/+949
| |/ /
| * | Git: Ignore `xrefr`Jean-Sébastien Pédron2016-06-281-10/+10
* | | Merge pull request #865 from rabbitmq/rabbitmq-server-863Michael Klishin2016-06-284-14/+98
|\ \ \
| * | | Set rabbit.slave_wait_timeout back to 15s at the end of this testMichael Klishin2016-06-281-6/+8
| * | | Test for stop pending slavesDiana Corbacho2016-06-281-1/+30
| * | | Ensure old incarnations of slaves are stopped before new ones startDiana Corbacho2016-06-283-13/+66
|/ / /
* | | Merge branch 'stable'Diana Corbacho2016-06-284-79/+310
|\ \ \ | |/ /
| * | Merge pull request #857 from rabbitmq/rabbitmq-server-802rabbitmq_v3_6_3_rc1Michael Klishin2016-06-284-79/+310
| |\ \