summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable'Michael Klishin2015-06-241-1/+1
|\
| * Correct a typo in 88b3a971b0f154f1415e5884bcca4afdf2221a37Michael Klishin2015-06-241-1/+1
| | | | | | | | Spotted by @Jakauppila.
* | 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_info
| | * adds missing callback to behaviour_infoAlvaro Videla2015-06-231-1/+2
| |/ | | | | | | Fixes #197
* | 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_info
| | * adds missing callback to behaviour_infoAlvaro Videla2015-06-231-2/+2
| |/ | | | | | | Fixes #194
* | Merge branch 'stable'Michael Klishin2015-06-181-0/+3
|\ \ | |/
| * Adds error message for list_user_permissions missing argumentAlvaro Videla2015-06-181-0/+3
| | | | | | | | Fixes #183
* | 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
| |/ | | | | | | Fixes #191
* | 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 as an alias for warning (the log level)
| | * Support warn log level (an alias for warning)Michael Klishin2015-06-111-0/+1
| | | | | | | | | | | | | | | | | | As a usability improvement. Fixes #186, references #185.
* | | Merge pull request #188 from weisslj/fix-digraph-typeMichael Klishin2015-06-121-1/+1
|\ \ \ | | | | | | | | Update digraph type
| * | | Update digraph typeJohannes Weißl2015-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The type digraph:digraph/0 got changed to digraph:graph/0 in OTP R16B03. To support older and newer releases a preprocessor define (with configure-like check) would be necessary.
* | | | 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
| | | | | | | | | | | | | | | | | | This restore backward compatibility and unbreak the test suite. References #62.
| * | 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 type
| * | | 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
| | | | | | | | | | | | Not available in older Erlang/OTP releases.
* | | Merge branch 'stable'Michael Klishin2015-06-094-97/+197
|\ \ \ | |/ /
| * | Merge pull request #181 from rabbitmq/rabbitmq-server-62-part1Alvaro Videla2015-06-094-97/+197
| |\ \ | | |/ | | | Introduce a timeout flag to rabbitmqctl (for some commands)
| | * Handle negative timeout valuesMichael Klishin2015-06-091-1/+5
| | |
| | * Improve timeout handling in ctlMichael Klishin2015-06-091-21/+44
| | | | | | | | | | | | | | | * Don't add any output when timeout = infinity (3.5.x default) * Support float values (round them)
| | * Mention timeout in rabbitmqctl(1)Michael Klishin2015-06-091-0/+10
| | |
| | * Add timeout option to list_* commandsMichael Klishin2015-06-093-97/+160
| |/
* | Merge pull request #174 from rabbitmq/rabbitmq-server-163Michael Klishin2015-05-282-77/+101
|\ \ | | | | | | Moves boot steps to its own module
| * | moves boot steps to its own moduleAlvaro Videla2015-05-282-77/+101
|/ /
* | Initial rabbit_writer doc essayMichael S. Klishin2015-05-261-3/+39
| |
* | Merge branch 'stable'Michael Klishin2015-05-240-0/+0
|\ \ | |/
| * (c) yearMichael Klishin2015-05-24165-168/+168
| |
* | (c) yearMichael Klishin2015-05-24167-170/+170
| |
* | rabbit_disk_monitor documentationMichael Klishin2015-05-241-8/+29
| |
* | Merge branch 'stable'Jean-Sébastien Pédron2015-05-222-0/+9
|\ \ | |/
| * RPM/deb changelogs for release 3.5.3rabbitmq_v3_5_3Jean-Sébastien Pédron2015-05-222-0/+9
| |
* | Merge branch 'stable'Michael Klishin2015-05-212-7/+38
|\ \ | |/
| * Merge branch 'rabbitmq-server-157' into stableJean-Sébastien Pédron2015-05-212-7/+38
| |\
| | * After starting the fhc, ensure it is workingJean-Sébastien Pédron2015-05-212-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a runtime check to ensure the fix proposed in #157 actually works. Export rabbit_table:wait_timeout/0 which returns the value of 'mnesia_table_loading_timeout' or 30000. We then use this timeout while waiting for the fhc test to finish. References #157.
* | | Merge branch 'stable'Michael Klishin2015-05-201-1/+2
|\ \ \ | |/ /
| * | Merge pull request #165 from rabbitmq/rabbitmq-server-162Michael Klishin2015-05-201-1/+2
| |\ \ | | | | | | | | Adds TLS suggestion
| | * | Adds TLS suggestionAlvaro Videla2015-05-201-1/+2
| |/ / | | | | | | | | | Fixes #162
* | | Merge branch 'stable'Jean-Sébastien Pédron2015-05-201-7/+9
|\ \ \ | |/ /
| * | Merge pull request #160 from rabbitmq/rabbitmq-server-157Alvaro Videla2015-05-191-7/+9
| |\ \ | | |/ | | | Start rabbit_alarm before FHC