summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Merge branch 'posix-sed' of https://github.com/cbandy/rabbitmq-server into cb...Michael Klishin2016-02-152-12/+3
| |\ \ \ |/ / / /
| * | | Use basic regular expressions for sed portabilityChris Bandy2016-02-092-12/+3
* | | | Merge branch 'stable'Michael Klishin2016-02-111-3/+56
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #617 from rabbitmq/rabbitmq-server-616Michael Klishin2016-02-111-3/+56
| |\ \ \
| | * | | rabbit_mirror_queue_sync: Pause the syncer process if memory is lowJean-Sébastien Pédron2016-02-101-3/+56
| |/ / /
* | | | Merge branch 'stable'Michael Klishin2016-02-101-1/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | rabbit_alarm: Fix resource_alarm_source() typeJean-Sébastien Pédron2016-02-101-1/+1
* | | Merge branch 'stable'Jean-Sébastien Pédron2016-02-091-4/+4
|\ \ \ | |/ /
| * | rabbitmq-env.bat: Do not prepare and escape RABBITMQ_PLUGINS_EXPAND_DIRrabbitmq_v3_6_1_rc1Jean-Sébastien Pédron2016-02-091-4/+4
* | | Merge pull request #611 from rabbitmq/rabbitmq-server-590Michael Klishin2016-02-054-6/+56
|\ \ \
| * | | Log connection pid onlyDaniil Fedotov2016-02-051-3/+5
| * | | Do not log connection refDaniil Fedotov2016-02-051-3/+3
| * | | More copy editsMichael Klishin2016-02-051-3/+3
| * | | Logging queue deletion at debug levelDaniil Fedotov2016-02-051-2/+2
| * | | GrammarMichael Klishin2016-02-051-1/+1
| * | | CopyMichael Klishin2016-02-051-4/+3
| * | | Fix wordingDaniil Fedotov2016-02-051-10/+25
| * | | Remove rabbitmq fork of lager dependencyDaniil Fedotov2016-02-041-2/+0
| * | | Merge branch 'master' into rabbitmq-server-590Daniil Fedotov2016-02-044-20/+37
| |\ \ \
| * | | | error_logger_lager_event sinkDaniil Fedotov2016-02-041-1/+2
| * | | | Federation log sinkDaniil Fedotov2016-02-041-1/+2
| * | | | Log auto delete with debug levelDaniil Fedotov2016-02-041-3/+3
| * | | | Resolve category name to sink nameDaniil Fedotov2016-02-041-1/+10
| * | | | Log auto deleting queuesDaniil Fedotov2016-02-041-2/+27
* | | | | Merge branch 'stable'Michael Klishin2016-02-051-15/+25
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Merge pull request #609 from bogdando/bug/1541029Michael Klishin2016-02-051-15/+25
| |\ \ \
| | * | | Fix action_stop for the rabbit OCFBogdan Dobrelya2016-02-041-15/+25
| |/ / /
* | | | Merge branch 'stable'Michael Klishin2016-02-041-1/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #604 from rabbitmq/rabbitmq-server-595Michael Klishin2016-02-041-1/+3
| |\ \ \
| | * | | Add emitting node info to amq.rabbitmq.log messagesMichael Klishin2016-02-041-1/+3
| |/ / /
* | | | Merge branch 'stable'Michael Klishin2016-02-031-23/+21
|\ \ \ \ | |/ / /
| * | | Merge pull request #602 from dmitrymex/stableMichael Klishin2016-02-031-23/+21
| |\ \ \