summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #204 from ingwinlu/python_detectionMichael Klishin2015-06-301-0/+4
|\
| * add detection for python2.7derwinlu2015-06-301-0/+4
|/
* Merge branch 'stable'Jean-Sébastien Pédron2015-06-291-2/+14
|\
| * Merge branch 'bug26427' into stableJean-Sébastien Pédron2015-06-291-2/+14
| |\
| | * Ensure the conditions to log "accepting..." match those for "closing..."Jean-Sébastien Pédron2015-06-291-1/+3
| | * Merge pull request #202 from legoscia/bug26427Jean-Sébastien Pédron2015-06-291-1/+11
| | |\
| | | * Be quiet about sockets closed during SSL upgradeMagnus Henoch2015-06-291-1/+11
| | |/
* | | Merge branch 'stable'Michael Klishin2015-06-291-6/+32
|\ \ \ | |/ /
| * | Merge pull request #201 from rabbitmq/rabbitmq-server-200Michael Klishin2015-06-291-6/+32
| |\ \
| | * | cosmeticsAlvaro Videla2015-06-261-5/+7
| | * | rabbit_amqqueue:on_node_up/1: Check the queue's running slaves listJean-Sébastien Pédron2015-06-261-6/+30
| |/ /
* | | Merge branch 'stable'Alvaro Videla2015-06-251-9/+9
|\ \ \ | |/ /
| * | applies emacs formatting to file_handle_cache.erlAlvaro Videla2015-06-251-9/+9
* | | Merge branch 'stable'Alvaro Videla2015-06-241-2/+44
|\ \ \ | |/ /
| * | Merge pull request #199 from rabbitmq/rabbitmq-server-196Alvaro Videla2015-06-241-2/+44
| |\ \
| | * | Limit clear_read_cache/0 action to the node it is running onJean-Sébastien Pédron2015-06-241-3/+7
| | * | file_handle_cache: Add a command to clear all read buffersJean-Sébastien Pédron2015-06-241-2/+40
* | | | Merge branch 'stable'Michael Klishin2015-06-241-1/+1
|\ \ \ \ | |/ / /
| * | | Correct a typo in 88b3a971b0f154f1415e5884bcca4afdf2221a37Michael Klishin2015-06-241-1/+1
* | | | Merge branch 'stable'Michael Klishin2015-06-231-1/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #198 from rabbitmq/rabbitmq-server-197Michael Klishin2015-06-231-1/+2
| |\ \ \
| | * | | adds missing callback to behaviour_infoAlvaro Videla2015-06-231-1/+2
| |/ / /
* | | | Merge branch 'stable'Michael Klishin2015-06-231-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #195 from rabbitmq/rabbitmq-server-194Michael Klishin2015-06-231-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | adds missing callback to behaviour_infoAlvaro Videla2015-06-231-2/+2
| |/ /
* | | Merge branch 'stable'Michael Klishin2015-06-181-0/+3
|\ \ \ | |/ /
| * | Adds error message for list_user_permissions missing argumentAlvaro Videla2015-06-181-0/+3
* | | Merge branch 'stable'Jean-Sébastien Pédron2015-06-171-4/+5
|\ \ \ | |/ /
| * | Merge branch 'rabbitmq-server-191' into stableJean-Sébastien Pédron2015-06-171-4/+5
| |\ \
| | * | adds missing find_prioritisers callAlvaro Videla2015-06-171-4/+5
| |/ /
* | | Merge branch 'stable'Michael Klishin2015-06-161-0/+1
|\ \ \ | |/ /
| * | Merge pull request #187 from rabbitmq/rabbitmq-server-186Alvaro Videla2015-06-161-0/+1
| |\ \
| | * | Support warn log level (an alias for warning)Michael Klishin2015-06-111-0/+1
* | | | Merge pull request #188 from weisslj/fix-digraph-typeMichael Klishin2015-06-121-1/+1
|\ \ \ \
| * | | | Update digraph typeJohannes Weißl2015-06-111-1/+1
* | | | | Merge branch 'stable'Jean-Sébastien Pédron2015-06-111-1/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch 'rabbitmq-server-62-part1' into stableJean-Sébastien Pédron2015-06-111-1/+6
| |\ \ \ | | |/ / | |/| |
| | * | action/5 calls action/6 with default timeout for unknown commandsJean-Sébastien Pédron2015-06-111-1/+6
| * | | Fix set typeJohannes Weißl2015-06-111-1/+1
* | | | Merge pull request #184 from weisslj/fix-set-typeMichael Klishin2015-06-111-1/+1
|\ \ \ \
| * | | | Fix set typeJohannes Weißl2015-06-111-1/+1
|/ / / /
* | | | Merge branch 'stable'Michael Klishin2015-06-101-4/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'rabbitmq-server-62-part1' into stableMichael Klishin2015-06-101-4/+1
| |\ \ \ | | |/ /
| | * | Avoid float_to_list/2Michael Klishin2015-06-101-4/+1
* | | | Merge branch 'stable'Michael Klishin2015-06-094-97/+197
|\ \ \ \ | |/ / /
| * | | Merge pull request #181 from rabbitmq/rabbitmq-server-62-part1Alvaro Videla2015-06-094-97/+197
| |\ \ \ | | |/ /
| | * | Handle negative timeout valuesMichael Klishin2015-06-091-1/+5
| | * | Improve timeout handling in ctlMichael Klishin2015-06-091-21/+44
| | * | Mention timeout in rabbitmqctl(1)Michael Klishin2015-06-091-0/+10
| | * | Add timeout option to list_* commandsMichael Klishin2015-06-093-97/+160
| |/ /