summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable'Michael Klishin2016-11-241-5/+3
|\
| * Merge pull request #1036 from rabbitmq/rabbitmq-server-1035Michael Klishin2016-11-241-4/+2
| |\
| | * Move rabbit:prep_stop/1 to stop/1 to avoid master termination crashDiana Corbacho2016-11-241-4/+2
* | | Merge branch 'stable'Jean-Sébastien Pédron2016-11-241-1/+1
|\ \ \ | |/ /
| * | Add rabbitmq_ct_client_helpers to TEST_DEPSJean-Sébastien Pédron2016-11-241-1/+1
| |/
* | Merge branch 'stable'Jean-Sébastien Pédron2016-11-231-0/+2
|\ \ | |/
| * Update rabbitmq-components.mkJean-Sébastien Pédron2016-11-231-0/+2
* | Merge branch 'stable'Gerhard Lazu2016-11-221-119/+119
|\ \ | |/
| * Update erlang.mkGerhard Lazu2016-11-221-305/+422
| * Update rabbitmq-components.mkGerhard Lazu2016-11-221-0/+2
* | Merge branch 'stable'Daniil Fedotov2016-11-212-240/+0
|\ \ | |/
| * Merge pull request #1032 from rabbitmq/rabbitmq-cli-118Daniil Fedotov2016-11-212-240/+0
| |\
| | * Move rabbit_pbe module to rabbitmq-commonArnaud Cogoluègnes2016-11-182-240/+0
| |/
* | Merge pull request #1031 from rabbitmq/rabbitmq-server-1030Michael Klishin2016-11-172-6/+5
|\ \
| * | Use binaries to define policiesArnaud Cogoluègnes2016-11-172-6/+5
|/ /
* | Merge pull request #1008 from rabbitmq/rabbitmq-server-988D Corbacho2016-11-147-27/+366
|\ \
| * | Improve loggingMichael Klishin2016-11-141-4/+10
| * | Update config examplesMichael Klishin2016-11-131-1/+6
| * | Integrate DNS peer discovery backend, more loggingMichael Klishin2016-11-134-26/+66
| * | Merge branch 'master' into rabbitmq-server-988Michael Klishin2016-11-131-0/+2
| |\ \
| * \ \ Merge branch 'master' into rabbitmq-server-988Michael Klishin2016-11-101-1/+1
| |\ \ \
| * | | | Skip DNS peer discovery backend tests in offline environmentsMichael Klishin2016-11-102-8/+26
| * | | | Integration tests for rabbit_peer_discovery_dnsMichael Klishin2016-11-102-3/+90
| * | | | Prefix hostnames discovered via DNSMichael Klishin2016-11-102-2/+30
| * | | | First cut at rabbit_peer_discovery_dnsMichael Klishin2016-11-101-0/+75
| * | | | Merge branch 'master' into rabbitmq-server-988Michael Klishin2016-11-1030-227/+334
| |\ \ \ \
| * | | | | Introduce autocluster.peer_discovery_backendMichael Klishin2016-11-032-32/+48
| * | | | | Initial DNS backend config schema support; decouple autocluster node type keyMichael Klishin2016-10-253-14/+78
* | | | | | Update erlang.mkJean-Sébastien Pédron2016-11-141-186/+303
| |_|_|/ / |/| | | |
* | | | | Update rabbitmq-components.mkJean-Sébastien Pédron2016-11-111-0/+2
| |_|/ / |/| | |
* | | | Export alarm function to avoid calling status/0 from cluster_status commandDaniil Fedotov2016-11-101-1/+1
| |/ / |/| |
* | | Merge pull request #1025 from rabbitmq/rabbitmq-common-46Michael Klishin2016-11-097-26/+19
|\ \ \
| * | | Add jsx to dependencies of RabbitArnaud Cogoluègnes2016-11-091-1/+1
| * | | Use conversion module for JSON arguments in CLIArnaud Cogoluègnes2016-11-093-12/+3
| * | | Accept both lists and binaries for JSON argumentsArnaud Cogoluègnes2016-11-093-3/+15
| * | | Fix JSON arguments parsing in CLIArnaud Cogoluègnes2016-11-093-6/+7
| * | | Update the list of magic plugins for rabbit_vmLoïc Hoguin2016-11-081-2/+1
| * | | Remove reference to mochiweb_http in diagnosticsLoïc Hoguin2016-11-081-1/+0
| * | | Switch JSON library to JSXLoïc Hoguin2016-11-083-19/+10
* | | | Make sure rabbitmqctl is built when running testsDaniil Fedotov2016-11-091-4/+3
* | | | Merge branch 'rabbitmq-cli-integration'Jean-Sébastien Pédron2016-11-089-99/+116
|\ \ \ \ | |/ / / |/| | |
| * | | rabbitmq-plugins.bat: Use `escript.exe` to run `rabbitmq-plugins`Jean-Sébastien Pédron2016-11-081-1/+1
| * | | Makefile: Rename target to `copy-escripts`Jean-Sébastien Pédron2016-11-081-2/+2
| * | | Makefile: Build rabbitmq-cli *before* copying escriptsJean-Sébastien Pédron2016-11-081-1/+1
| * | | In development environment, check for ENABLED_PLUGINS_DIR for rabbitmqctl tooDaniil Fedotov2016-11-072-4/+6
| * | | Windows integration for plugins and diagnosticsDaniil Fedotov2016-11-032-9/+71
| * | | Use the new cli in windows rabbitmqctlDaniil Fedotov2016-10-311-10/+11
| * | | Add escript folder to store build ctl escriptsDaniil Fedotov2016-10-277-15/+19
| * | | Integrate escripts from rabbitmq_cli on makeDaniil Fedotov2016-10-255-80/+28
| |/ /
* | | Merge pull request #1023 from rabbitmq/rabbitmq-server-1022rabbitmq_v3_7_0_milestone7Michael Klishin2016-11-0710-43/+99
|\ \ \