summaryrefslogtreecommitdiff
Commit message (Collapse)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 R19
| | * 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
| | | | | | | | | | | | | | We only support Erlang 18.3+. Therefore we can revert what was done in b6a3aa477156036c129d04a82c90ad916bc3865e. [#118562897]
* | 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
| | | | | | | | Those macros are provided by `old_builtin_types.hrl` in rabbitmq-common.
* | 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
| | | | | | | | Hopefully the testsuite should be quiet enough now.
| * 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
| | | | | | | | Those macros are provided by `old_builtin_types.hrl` in rabbitmq-common.
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that systemd support is introduced, there is an issue with package dependencies between Ubuntu 14.04 and 16.04. We produce releases on Debian Wheezy which specifies init-system-hlpers 1.18 as a dependency. Unfortunately that version is not available on Ubuntu 14.04, only 1.14 is. So we primarily have 4 options for the short term: * Revert systemd support and upset 16.04 users * Drop 14.04 support and upset 14.04 users * Switch to Ubuntu 14.04 for producing Debian packages and hope it will work on Debian * Hardcode the dependency Options 3 and 4 seem to be the least of all evils. We will evaluate option 3 separately.
| * Update Uploaders listMichael Klishin2016-07-011-4/+3
| |
| * Travis CI: Lower verbosity of common_testJean-Sébastien Pédron2016-07-011-1/+1
| | | | | | | | | | | | | | | | Out-of-the-box, it spits more than 4 MiB of messages, which is above the limit imposed by Travis, causing a build failure. While here, remove the use of `travis_wait` because our common_test helper make sure we log at least a message every minute.
| * 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
| | | | | | | | | | References rabbitmq/rabbitmq-server#860. [#122335241]
* | 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 handle
| | * 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 queue reductions per second and GC options
| | * 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
| | | | | | | | | | | | | | | References rabbitmq/rabbitmq-server#860. [#122335241]
* | | 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
| |\ \ | | | | | | | | Compile on OTP 19.0
| | * \ 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
| | | | | | | | | | | | | | | | | | | | References #860. [#122335241]
| | * | Use the new -spec formatJean-Sébastien Pédron2016-06-2883-1281/+949
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old format is removed in Erlang 19.0, leading to build errors. Also, get rid of the `use_specs` macro and thus always define -spec() & friends. While here, unnify the style of -type and -spec. References #860. [#118562897] [#122335241]
| * | 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
|\ \ \ | | | | | | | | Stop pending slaves on restart
| * | | 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
|/ / / | | | | | | | | | | | | * Solves race condition between master asking to stop and the restart of the queues.
* | | 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
| |\ \ | | | | | | | | Infinity loop in synchronisation of priority queues