summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable'Michael Klishin2016-03-025-13/+35
|\
| * Merge branch 'rabbitmq-server-398' into stableMichael Klishin2016-03-025-13/+35
| |\
| | * Merge branch 'stable' into rabbitmq-server-398Michael Klishin2016-03-029-135/+194
| | |\ | | |/ | |/|
| | * WordingMichael Klishin2016-02-291-3/+3
| | * Return error codes in node health checkDiana Corbacho2016-02-261-2/+3
| | * Restore rabbit_cli:rpc_call APIDiana Corbacho2016-02-261-1/+18
| | * Move health checks to rabbit_common and rabbit_cli:rpc_call to rabbit/rabbit_...Diana Corbacho2016-02-254-83/+8
| | * Rename aliveness_test to node_health_checkDiana Corbacho2016-02-252-24/+24
| | * Use net_ticktime + 10s as timeout in the aliveness test and abort with the fi...Diana Corbacho2016-02-251-14/+15
| | * Add aliveness_test documentationDiana Corbacho2016-02-251-0/+15
| | * Aliveness checkDiana Corbacho2016-02-251-1/+64
* | | Merge branch 'stable'Michael Klishin2016-03-021-1/+2
|\ \ \ | |/ /
| * | Merge pull request #669 from rabbitmq/rabbitmq-server-667Michael Klishin2016-03-021-1/+2
| |\ \
| | * | Bump rabbit.channel_operation_timeout default to 15sMichael Klishin2016-03-021-1/+2
| |/ /
* | | Merge branch 'stable'Michael Klishin2016-03-012-0/+9
|\ \ \ | |/ /
| * | Commit 3.6.1-1 change lograbbitmq_v3_6_1Michael Klishin2016-03-012-0/+9
* | | Merge branch 'stable'Michael Klishin2016-03-011-0/+3
|\ \ \ | |/ /
| * | Ignore debug/* and PACKAGES/*Michael Klishin2016-03-011-0/+3
* | | Merge branch 'stable'Michael Klishin2016-03-012-24/+24
|\ \ \ | |/ /
| * | Merge branch 'deadtrickster-rabbitmqctl-man-fix' into stableMichael Klishin2016-03-011-23/+23
| |\ \
| | * | vhostpath => vhost in rabbitmqctl.1Michael Klishin2016-03-011-23/+23
| | * | Document rabbitmqctl commands sync_queue, cancel_sync_queue, purge_queue also...Ilya Khaprov2016-02-291-3/+3
| |/ /
| * | Run xmlto in more verbose modeMichael Klishin2016-02-291-1/+1
* | | Merge branch 'stable'Michael Klishin2016-02-291-55/+77
|\ \ \ | |/ /
| * | Merge pull request #657 from dmitrymex/seamless-promotionMichael Klishin2016-02-291-55/+77
| |\ \
| | * | [OCF HA] On neighbor promotion do nothing if we are already clusteredDmitry Mescheryakov2016-02-291-15/+31
| | * | [OCF HA] Do not check cluster health if master is not electedDmitry Mescheryakov2016-02-261-41/+47
* | | | Merge branch 'stable'Michael Klishin2016-02-271-40/+57
|\ \ \ \ | |/ / /
| * | | Merge pull request #655 from rabbitmq/rabbitmq-server-596Michael Klishin2016-02-271-40/+57
| |\ \ \ | | |/ / | |/| |
| | * | Unescape list_permission and list_user_permission regexesDiana Corbacho2016-02-261-40/+57
| |/ /
* | | Merge branch 'stable'Michael Klishin2016-02-251-1/+1
|\ \ \ | |/ /
| * | Merge pull request #650 from dmitrymex/increase-timeoutMichael Klishin2016-02-251-1/+1
| |\ \
| | * | [OCF HA] Increase tolerable number of rabbitmqctl timeoutsDmitry Mescheryakov2016-02-251-1/+1
| |/ /
* | | Ignore debug/*Michael Klishin2016-02-231-0/+1
* | | Merge branch 'stable'Michael Klishin2016-02-191-0/+2
|\ \ \ | |/ /
| * | Merge pull request #636 from rabbitmq/rabbitmq-server-634Gabriele Santomaggio2016-02-191-0/+2
| |\ \
| | * | Do not jump to finish in windows uninstallDaniil Fedotov2016-02-181-0/+1
| | * | Do not jump to finish in windows installDaniil Fedotov2016-02-181-0/+1
| | |/
* | | Merge branch 'stable'Michael Klishin2016-02-191-9/+11
|\ \ \ | |/ /
| * | Merge pull request #639 from lefremova/stableMichael Klishin2016-02-191-9/+9
| |\ \
| | * | Private attributes usage in rabbitmq scriptLiubov Efremova2016-02-191-9/+9
| | |/
| * | Merge pull request #630 from dmitrymex/stableMichael Klishin2016-02-191-0/+2
| |\ \
| | * | Exit waiting loop once node has unjoinedDmitry Mescheryakov2016-02-161-0/+2
* | | | Merge branch 'stable'Michael Klishin2016-02-181-1/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #635 from rabbitmq/rabbitmq-server-248rabbitmq_v3_6_1_rc2Michael Klishin2016-02-181-1/+3
| |\ \ \
| | * \ \ Merge branch 'stable' into rabbitmq-server-248Michael Klishin2016-02-187-54/+115
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Bump rabbit.channel_operation_timeout to 5sMichael Klishin2016-02-181-1/+1
| | * | | Sets initial channel_operation_timeout to 3s.Ayanda Dube2016-02-171-1/+1
| | * | | Adds channel_operation_timeout envionment variable.Ayanda Dube2016-02-171-1/+3
* | | | | Merge branch 'stable'Jean-Sébastien Pédron2016-02-181-6/+7
|\ \ \ \ \ | |/ / / /