summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* merge stable into defaultMatthias Radestock2014-02-241-32/+44
|\
| * merge bug26013 into stableMatthias Radestock2014-02-241-32/+44
| |\
| | * improve clarity and correctnessMatthias Radestock2014-02-201-30/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce blocked_by_alarm state predicate which makes it easier / more obvious to detect the transitions to/from - do not send 'unblocked' when the client doesn't have the capability - ditch superfluous true/false return from maybe_send_unblocked (now send_unblocked) - detect the transition into blocked_by_alarm that can result from handling conserve_resources (the original purpose of the bug)
| | * Eliminate a compiler warningMichael Klishin2014-02-191-1/+1
| | |
| | * Send connection.unblocked when connection is no longer blocked or all alarms ↵Michael Klishin2014-02-191-1/+4
| | | | | | | | | | | | clear
| | * Make connection.[un]blocked independent from flow controlMichael Klishin2014-02-191-16/+17
| | |
* | | Bug 25939 broke AMQP 1.0; fix it.Simon MacMullen2014-02-191-1/+1
| | |
* | | stable to defaultSimon MacMullen2014-02-1960-1809/+2733
|\ \ \ | |/ / |/| |
| * | Merge bug26022Simon MacMullen2014-02-190-0/+0
| |\ \
| * | | Add LDAP timeout to example configSimon MacMullen2014-02-191-0/+4
| |/ /
| * | cosmeticMatthias Radestock2014-02-181-3/+3
| | |
| * | merge bug25868 into defaultMatthias Radestock2014-02-180-0/+0
| |\ \
| | * \ Merge bug25868 (again)Simon MacMullen2014-02-181-5/+4
| | |\ \
| | * \ \ Merge bug25868Simon MacMullen2014-02-180-0/+0
| | |\ \ \
| * | | | | clearerMatthias Radestock2014-02-181-5/+7
| | |_|/ / | |/| | | | | | | | | | | | | I think
| * | | | Only ever return 'flow' if there are no alarms. I think in theory it's not ↵Simon MacMullen2014-02-181-5/+4
| |/ / / | | | | | | | | | | | | possible for there to be an alarm when in flow control, but this is more correct and no less clear.
| * | | OopsSimon MacMullen2014-02-171-1/+0
| | | |
| * | | ...but only do that if we are not also alarmed.Simon MacMullen2014-02-171-2/+4
| | | |
| * | | Show state as 'flow' if we are currently flow blocked and have been so for ↵Simon MacMullen2014-02-172-6/+8
| |/ / | | | | | | | | | more than 5s.
| * | Merge bug25627 (again)Simon MacMullen2014-02-1748-1097/+1628
| |\ \
| | * \ Merge bug25627Simon MacMullen2014-02-171-1/+7
| | |\ \
| | * \ \ stable to defaultSimon MacMullen2014-02-172-8/+10
| | |\ \ \ | | | | |/ | | | |/|
| | * | | merge bug25853 into defaultMatthias Radestock2014-02-133-49/+66
| | |\ \ \
| | | * \ \ merge default into bug25853Matthias Radestock2014-02-101-6/+13
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | since the previous merge pulled in a breakage
| | | * | | | rabbit_file:wildcard/2 should return [] if the dir is non-existingTim Watson2014-02-101-3/+6
| | | | | | |
| | | * | | | oopsMatthias Radestock2014-02-101-1/+1
| | | | | | |
| | | * | | | merge default into bug25853Matthias Radestock2014-02-1032-566/+931
| | | |\ \ \ \
| | | * | | | | cosmeticMatthias Radestock2014-02-101-6/+4
| | | | | | | |
| | | * | | | | rename misleading variablesMatthias Radestock2014-02-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and fix a counting error
| | | * | | | | simplifying refactorMatthias Radestock2014-02-061-17/+14
| | | | | | | |
| | | * | | | | Use dirty opts to find durable queues during startup (and optimise)Tim Watson2014-02-051-4/+3
| | | | | | | |
| | | * | | | | Simplify durable queue recovery and avoid a dict lookup on the resultsTim Watson2014-02-051-12/+6
| | | | | | | |
| | | * | | | | Perform (and wait for) queue recovery in parallelTim Watson2014-01-301-4/+15
| | | | | | | |
| | | * | | | | merge default into bug25853Matthias Radestock2014-01-241-19/+34
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | containing the recently merged bug25827
| | | | * \ \ \ \ merge default into bug25853Tim Watson2014-01-241-19/+34
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge default into bug25853Tim Watson2014-01-227-161/+71
| | | | | |\ \ \ \ \
| | | | | * | | | | | Optimise queue index initialisationTim Watson2014-01-201-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid loading the journal when the file doesn’t exist. Also try to avoid flushing the journal unless necessary.
| | * | | | | | | | | stable to defaultSimon MacMullen2014-02-1359-1763/+2654
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge bug25985 (again)Simon MacMullen2014-02-111-5/+9
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Allow username without password after all.Simon MacMullen2014-02-111-5/+9
| | | | | | | | | | | | |
| | | * | | | | | | | | | stable to defaultSimon MacMullen2014-02-1159-1762/+2649
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | merge bug26000 into defaultMatthias Radestock2014-02-101-6/+13
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | again
| | | | * | | | | | | | | stable to default (noop)Simon MacMullen2014-02-1059-1762/+2649
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge bug26000Simon MacMullen2014-02-1059-1764/+2666
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ Merge bug24738Simon MacMullen2014-02-100-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | And after running dialyzer...Simon MacMullen2014-02-102-2/+2
| | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | Merge in defaultSimon MacMullen2014-02-1023-378/+682
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / /
| | | | | | | * | | | | | | | | Merge bug25985Simon MacMullen2014-02-0710-250/+376
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |_|/ / / / / / / | | | | | | | |/| | | | | | | |
| | | | | | | | * | | | | | | | Merge bgu26001Simon MacMullen2014-02-071-2/+2
| | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | don't sync so oftenMatthias Radestock2014-02-061-2/+2
| | | | | | | | | | | | | | | | |
View Lorry Controller Status