summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* make draining part of r_limiter:creditbug25954Matthias Radestock2014-01-102-29/+34
* Merge headsSimon MacMullen2014-01-102-8/+6
|\
| * merge bug25938 into defaultMatthias Radestock2014-01-103-119/+146
| |\
| * | revert most of http://hg.rabbitmq.com/rabbitmq-server/rev/5fddc5198854bug25938Matthias Radestock2014-01-102-8/+6
* | | Merge bug25817Simon MacMullen2014-01-1012-691/+901
|\ \ \ | | |/ | |/|
| * | merge stable into defaultMatthias Radestock2014-01-101-4/+4
| |\ \
| | * | simplify even furtherMatthias Radestock2014-01-101-4/+4
| * | | merge stable into defaultMatthias Radestock2014-01-1021-769/+1124
| |\ \ \ | | |/ / | |/| |
| | * | Merge bug25938 (again)Simon MacMullen2014-01-092-112/+142
| | |\ \ | | | |/ | | |/|
| | | * Merge bug25951Simon MacMullen2014-01-093-64/+57
| | | |\
| | | * | extract dead-letter publishing from rabbit_amqqueue_processbug25951Matthias Radestock2014-01-082-112/+142
| | * | | fix credit handlingMatthias Radestock2014-01-092-16/+32
| | * | | merge default into bug25938Matthias Radestock2014-01-097-186/+182
| | |\ \ \ | | | | |/ | | | |/|
| | | * | cosmeticMatthias Radestock2014-01-091-4/+3
| | | * | merge stable into defaultMatthias Radestock2014-01-0920-655/+965
| | | |\ \
| | | | * \ merge stable into defaultMatthias Radestock2014-01-0820-655/+965
| | | | |\ \ | | | | | |/
| | | | | * Merge bug25948Simon MacMullen2014-01-080-0/+0
| | | | | |\
| | | | | * \ merge default into bug25948bug25948Matthias Radestock2014-01-083-14/+14
| | | | | |\ \ | | | | | | |/
| | | | | | * stable to default (noop)Simon MacMullen2014-01-080-0/+0
| | | | | | |\
| | | | | | * \ Merge bug25937Simon MacMullen2014-01-082-12/+21
| | | | | | |\ \
| | | | | | | * \ (re)merge bug25942 into defaultMatthias Radestock2014-01-071-1/+1
| | | | | | | |\ \
| | | | | | | | * | grrr, forgot onebug25942Matthias Radestock2014-01-071-1/+1
| | | | | | | * | | (re)merge bug25942 into defaultMatthias Radestock2014-01-071-10/+10
| | | | | | | |\ \ \ | | | | | | | | |/ /
| | | | | | | | * | it turns out that dialyzer dislikes improper listsMatthias Radestock2014-01-071-10/+10
| | | | | | * | | | Rename this againbug25937Simon MacMullen2014-01-082-3/+3
| | | | | * | | | | simpler and more efficientMatthias Radestock2014-01-081-3/+1
| | | | | * | | | | merge bug25937 into bug25948Matthias Radestock2014-01-083-64/+52
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Even clearer?Simon MacMullen2014-01-072-18/+18
| | | | | | * | | | Maybe this is clearer?Simon MacMullen2014-01-072-17/+17
| | | | | | * | | | Simplify further, don't use a proplistSimon MacMullen2014-01-072-4/+5
| | | | | | * | | | Simplfy (although perhaps not as much as we had hoped) by only informing queu...Simon MacMullen2014-01-073-52/+38
| | | | | * | | | | simplifyMatthias Radestock2014-01-071-13/+12
| | | | | * | | | | simplify rabbit_queue_consumers:deliver even furtherMatthias Radestock2014-01-072-33/+29
| | | | | * | | | | better helperMatthias Radestock2014-01-071-26/+22
| | | | | * | | | | keep State out of one of the FetchFunsMatthias Radestock2014-01-071-10/+14
| | | | | * | | | | make rabbit_queue_consumers:deliver deliver at most one messageMatthias Radestock2014-01-072-75/+88
| | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | Merge bug25935Simon MacMullen2014-01-071-1/+10
| | | | | |\ \ \ \
| | | | | | * | | | Accept this from federation.bug25935Simon MacMullen2014-01-071-1/+10
| | | | | |/ / / /
| | | | | * | | | stable to defaultSimon MacMullen2014-01-070-0/+0
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | Merge bug25938Simon MacMullen2014-01-073-353/+503
| | | | | |\ \ \ \
| | * | | | | | | | Oops, don't explode in the empty=true drain=false case!Simon MacMullen2014-01-091-1/+1
| | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Multi-headsSimon MacMullen2014-01-071-6/+4
| | * | | | | | | Fix handling of credit arriving with drain=true and an empty queue - we need ...Simon MacMullen2014-01-072-9/+13
| | * | | | | | | Merge in defaultSimon MacMullen2014-01-075-112/+127
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Stable to defaultSimon MacMullen2014-01-0716-272/+431
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge bug 25943Simon MacMullen2014-01-071-40/+34
| | | | |\ \ \ \ \ \
| | | | | * | | | | | cosmeticbug25943Matthias Radestock2014-01-031-6/+5
| | | | | * | | | | | lift buffer vars from stateMatthias Radestock2014-01-031-36/+32
| | | | | * | | | | | merge bug25939 into bug25943Matthias Radestock2014-01-031-23/+41
| | | | | |\ \ \ \ \ \
| | | | * | \ \ \ \ \ \ Merge bug25939Simon MacMullen2014-01-061-23/+41
| | | | |\ \ \ \ \ \ \ \
View Lorry Controller Status