summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable'Jean-Sébastien Pédron2015-05-122-0/+9
|\
| * RPM/deb changelogs for release 3.5.2rabbitmq_v3_5_2Jean-Sébastien Pédron2015-05-122-0/+9
* | Merge branch 'stable'Michael Klishin2015-05-111-15/+74
|\ \ | |/
| * Merge pull request #153 from rabbitmq/rabbitmq-server-152Alvaro Videla2015-05-111-15/+74
| |\
| | * Re-format for 80 characters wideMichael Klishin2015-05-111-20/+25
| | * Re-format with EmacsMichael Klishin2015-05-111-27/+27
| | * Use a set to look up previously seen {queue, reason} keysMichael Klishin2015-05-101-15/+19
| | * RefactorMichael Klishin2015-05-101-4/+6
| | * RefactorMichael Klishin2015-05-101-23/+22
| | * Support x-death event proplists from before #78Michael Klishin2015-05-101-14/+63
* | | Merge branch 'stable'Jean-Sébastien Pédron2015-05-111-1/+6
|\ \ \ | |/ /
| * | Merge branch 'rabbitmq-server-138' into stableJean-Sébastien Pédron2015-05-111-1/+6
| |\ \ | | |/ | |/|
| | * Make credit flow state transition interval 1s instead of 5sMichael Klishin2015-05-071-1/+6
| |/
* | cosmeticsAlvaro Videla2015-05-101-1/+1
* | adds missing wordAlvaro Videla2015-05-081-1/+1
* | Merge pull request #139 from rabbitmq/rabbitmq-server-137Jean-Sébastien Pédron2015-05-072-0/+22
|\ \
| * | creadit_flow.erl: Indent both TRACE_* macros the same wayJean-Sébastien Pédron2015-05-071-3/+3
| * | RenameMichael Klishin2015-05-061-7/+7
| * | Include more information about processes blocked by credit_flowMichael Klishin2015-05-021-2/+8
| * | Merge branch 'master' into rabbitmq-server-137Michael Klishin2015-05-022-4/+4
| |\ \
| * | | Make it possible to publish credit_flow events to rabbit_eventMichael Klishin2015-05-022-0/+16
* | | | Merge branch 'stable'Jean-Sébastien Pédron2015-05-071-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'rabbitmq-server-129' into stableJean-Sébastien Pédron2015-05-071-1/+1
| |\ \ \
| | * | | rabbitmq-script-wrapper: Don't use "exec" in front of "su"Jean-Sébastien Pédron2015-04-231-1/+1
* | | | | Merge branch 'stable'Michael Klishin2015-05-072-6/+47
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #146 from rabbitmq/rabbitmq-server-134Michael Klishin2015-05-072-6/+47
| |\ \ \ \
| | * | | | File handle cache: Pay attention to memory useJean-Sébastien Pédron2015-05-062-6/+47
| |/ / / /
* | | | | Merge pull request #149 from rabbitmq/rabbitmq-server-148Michael Klishin2015-05-061-2/+2
|\ \ \ \ \
| * | | | | removes dictionary from the PROCESS_INFO keysAlvaro Videla2015-05-061-2/+2
|/ / / / /
* | | | | Merge pull request #144 from rabbitmq/rabbitmq-server-143Michael Klishin2015-05-064-2/+69
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Allows credit flow Credits to be set via configurationAlvaro Videla2015-05-054-2/+69
|/ / / /
* | | | Merge pull request #136 from rabbitmq/rabbitmq-server-135Michael Klishin2015-05-012-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use os:timestamp/1 instead of erlang:now/0 in credit_flow and rabbit_readerMichael Klishin2015-04-302-4/+4
| |/ /
* | | Merge branch 'stable'Jean-Sébastien Pédron2015-04-301-3/+21
|\ \ \ | |/ /
| * | Merge branch 'rabbitmq-server-128' into stableJean-Sébastien Pédron2015-04-301-3/+21
| |\ \
| | * | rabbitmq-server: Add a way to send log messages to stdoutJean-Sébastien Pédron2015-04-301-3/+21
| |/ /
* | | Merge branch 'stable'Michael Klishin2015-04-292-5/+16
|\ \ \ | |/ /
| * | Merge pull request #133 from rabbitmq/rabbitmq-server-114Michael Klishin2015-04-292-5/+15
| |\ \ | | |/ | |/|
| | * Reduce number of possible values of rabbit.mirroring_flow_controlMichael Klishin2015-04-292-4/+2
| | * Move mirroring flow control setting into rabbit_channel:initMichael Klishin2015-04-292-11/+14
| | * Make gm flow control configurableMichael Klishin2015-04-162-2/+11
* | | Merge pull request #131 from rabbitmq/cosmetics-54Michael Klishin2015-04-272-39/+51
|\ \ \
| * | | cosmeticsAlvaro Videla2015-04-271-35/+48
| * | | tests cleanupAlvaro Videla2015-04-271-4/+3
|/ / /
* | | Merge pull request #130 from rabbitmq/rabbitmq-server-54Michael Klishin2015-04-260-0/+0
|\ \ \
| * | | Remove Python/HTTP API testsMichael Klishin2015-04-262-1075/+0
| * | | Merge branch 'sla_tracking_v2' of git://github.com/alexethomas/rabbitmq-serve...Michael Klishin2015-04-267-14/+1205
| |\ \ \
* | \ \ \ Merge pull request #54 from alexethomas/sla_tracking_v2Michael Klishin2015-04-267-14/+1205
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Extract DELIVERY_MODE and DURABLE to globalsAlex Thomas2015-04-131-8/+12
| * | | Temporary addition of Python test script to help track down initially-blank h...Alex Thomas2015-04-132-0/+1071