summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * Document configuration encryptionArnaud Cogoluègnes2016-10-172-0/+104
| |/
* | Merge branch 'stable'Arnaud Cogoluègnes2016-10-141-1/+0
|\ \ | |/
| * Remove version_equivalance entry from test groupArnaud Cogoluègnes2016-10-141-1/+0
* | Merge branch 'stable'Arnaud Cogoluègnes2016-10-143-13/+13
|\ \ | |/
| * Use config_entry_decoder key for config encryptionArnaud Cogoluègnes2016-10-143-13/+13
* | Merge pull request #989 from rabbitmq/rabbitmq-server-486Arnaud Cogoluègnes2016-10-144-8/+124
|\ \
| * | Be more defensive and accept 'disk'Michael Klishin2016-10-141-1/+1
| * | Merge branch 'master' into rabbitmq-server-486Michael Klishin2016-10-1429-2020/+910
| |\ \
| * | | 2016, evenMichael Klishin2016-10-141-1/+1
| * | | Merge branch 'master' into rabbitmq-server-486Michael Klishin2016-10-046-431/+87
| |\ \ \
| * | | | Switch config-driven automatic clustering to the new behaviourMichael Klishin2016-10-044-8/+122
| * | | | Drive-by change: reduce log noiseMichael Klishin2016-10-041-5/+8
* | | | | Support x.y in plugin versioningDaniil Fedotov2016-10-141-1/+1
* | | | | Merge branch 'stable'Daniil Fedotov2016-10-141-11/+0
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Merge pull request #997 from rabbitmq/broaden-version-format-supportDaniil Fedotov2016-10-141-10/+0
| |\ \ \
| | * | | unit_SUITE: move version equivalence tests to commonJean-Sébastien Pédron2016-10-121-10/+0
| |/ / /
* | | | Merge branch 'stable'Arnaud Cogoluègnes2016-10-1211-22/+810
|\ \ \ \ | |/ / /
| * | | Merge pull request #994 from rabbitmq/rabbitmq-server-979Karl Nilsson2016-10-129-4/+736
| |\ \ \
| | * | | Add better message when decryption fails in configArnaud Cogoluègnes2016-10-124-14/+50
| | * | | Merge branch 'stable' into rabbitmq-server-979Arnaud Cogoluègnes2016-10-116-440/+138
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'rabbitmq-server-990' into stablerabbitmq_v3_6_6_milestone5Andrew Bruce2016-10-052-18/+73
| |\ \ \ \
| | * | | | Choose master from intersection of sync slaves and policy nodesAndrew Bruce2016-10-052-18/+73
| |/ / / /
| | * | | Create tests for rabbitmqctl encodeArnaud Cogoluègnes2016-10-115-61/+173
| | * | | Use terms in rabbitmqctl encodeArnaud Cogoluègnes2016-10-111-9/+21
| | * | | Add encode command to rabbitmqctlArnaud Cogoluègnes2016-10-104-14/+87
| | * | | Remove a pointless commentLoïc Hoguin2016-10-061-3/+1