summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Timeout values are in millisecondsMichael Klishin2016-11-071-1/+1
| * | Log the number of retries leftDiana Corbacho2016-11-071-1/+2
| * | Log Mnesia reconnection attemptsDiana Corbacho2016-11-071-0/+4
| * | Configure member retries on Mnesia reconnection failuresDiana Corbacho2016-11-0710-43/+94
|/ /
* | Merge branch 'stable'Michael Klishin2016-10-291-0/+1
|\ \
| * | Link to website source reporabbitmq_v3_6_6_rc2rabbitmq_v3_6_6Michael Klishin2016-10-291-0/+1
* | | Merge branch 'stable'Michael Klishin2016-10-290-0/+0
|\ \ \ | |/ /
| * | Update README.mdMichael Klishin2016-10-291-2/+3
* | | Merge branch 'stable'Michael Klishin2016-10-291-9/+5
|\ \ \ | |/ /
| * | Update README.mdMichael Klishin2016-10-291-1/+1
* | | Merge branch 'stable'Michael Klishin2016-10-261-43/+68
|\ \ \ | |/ /
| * | Merge pull request #1012 from rabbitmq/rabbitmq-server-960rabbitmq_v3_6_6_rc1Michael Klishin2016-10-261-43/+68
| |\ \
| | * \ Merge branch 'stable' into rabbitmq-server-960Michael Klishin2016-10-263-7/+27
| | |\ \ | | |/ / | |/| |
| | * | Ignore unknown ackDiana Corbacho2016-10-261-43/+68
* | | | Merge branch 'stable'Michael Klishin2016-10-261-5/+14
|\ \ \ \ | |/ / /
| * | | Merge pull request #1011 from rabbitmq/rabbitmq-server-972Michael Klishin2016-10-261-5/+14
| |\ \ \
| | * \ \ Merge branch 'stable' into rabbitmq-server-972Michael Klishin2016-10-261-1/+6
| | |\ \ \
| | * | | | Avoid duplicates in members list during partial partitionDiana Corbacho2016-10-251-5/+14
| | | |/ / | | |/| |
* | | | | Merge branch 'stable'Michael Klishin2016-10-261-1/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #1009 from rabbitmq/rabbitmq-server-1006Michael Klishin2016-10-261-1/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Stop master in receiving sync_start from another master after partitionDiana Corbacho2016-10-251-1/+7
| | |/ /
* | | | Merge branch 'stable'Michael Klishin2016-10-261-1/+6
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge pull request #1010 from rabbitmq/rabbitmq-server-1007Michael Klishin2016-10-261-1/+6
| |\ \ | | |/ | |/|
| | * Ignore policy_changed on slavesDiana Corbacho2016-10-251-1/+6
| |/
* | Do not fail on {cluster_nodes, [node()]} configDaniil Fedotov2016-10-201-3/+3
* | Merge branch 'stable'Arnaud Cogoluègnes2016-10-172-0/+94
|\ \ | |/
| * Merge pull request #999 from rabbitmq/rabbitmq-website-282Karl Nilsson2016-10-172-0/+94
| |\
| | * Change formatting for rabbitmqctl helpArnaud Cogoluègnes2016-10-171-12/+2