summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |/ / / /
| * | | | Makefile: Fix Makefile indentationJean-Sébastien Pédron2016-02-181-5/+5
| * | | | make manpages: Fix xmlto(1) failures handlingJean-Sébastien Pédron2016-02-181-1/+2
| | |/ / | |/| |
* | | | Merge branch 'stable'Michael Klishin2016-02-171-0/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #631 from rabbitmq/rabbitmq-server-625Michael Klishin2016-02-171-0/+2
| |\ \ \ | | |_|/ | |/| |
| | * | IndentationMichael Klishin2016-02-171-2/+2
| | * | added erl with -sname to make sure epmd is startedgabriele santomaggio2016-02-171-0/+2
| |/ /
* | | Squash a warningMichael Klishin2016-02-161-1/+1
* | | Merge branch 'stable'Michael Klishin2016-02-150-0/+0
|\ \ \ | |/ /
| * | Use basic regular expressions for sed portabilityChris Bandy2016-02-152-12/+3
* | | Merge branch 'cbandy-posix-sed'Michael Klishin2016-02-153-12/+5
|\ \ \
| * | | Ignore PACKAGES/*Michael Klishin2016-02-151-0/+2