summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remove R13-ism imported from upstreambug23958Matthias Radestock2013-05-071-2/+3
* ever so slightly clearerMatthias Radestock2013-05-011-4/+2
* Minor variable renaming, document subtle one_for_all child deletion clausesTim Watson2013-04-261-2/+3
* back out of f608b9df9a14 changes supervisor2_testsTim Watson2013-04-191-56/+2
* Refactor restart handlingTim Watson2013-04-192-3/+60
* merge defaultTim Watson2013-04-1618-275/+468
|\
| * merge stable into defaultTim Watson2013-04-161-8/+21
| |\
| | * merge bug25518 into stableTim Watson2013-04-161-8/+21
| | |\
| | | * Be rather less arbitrary. But still a bit.Simon MacMullen2013-04-091-5/+5
| | | * ExcuseSimon MacMullen2013-04-091-1/+1
| | | * Explain a bit more WTF we're doing.Simon MacMullen2013-04-091-0/+2
| | | * Add support for UID. No, it's not in public_key.hrl. Grrr.Simon MacMullen2013-04-091-1/+2
| | | * Also RFC4514 suggests we always use = even if we don't recognise an OID.Simon MacMullen2013-04-091-2/+2
| | | * Insert a hack.Simon MacMullen2013-04-091-0/+10
| | | * Replace all uses of io_lib:format/2 with rabbit_misc:format/2 - we want somet...Simon MacMullen2013-04-091-7/+7
| | |/
| * | Merge bug25504Simon MacMullen2013-04-161-106/+24
| |\ \
| | * | Further excisionsbug25504Emile Joubert2013-04-161-4/+2
| | * | Minimise diffEmile Joubert2013-04-051-1/+1
| | * | DLX without confirmsEmile Joubert2013-04-041-103/+23
| * | | Merge bug25519.Simon MacMullen2013-04-101-1/+1
| |\ \ \
| | * | | Allow use of esl-erlangbug25519Simon MacMullen2013-04-101-1/+1
| |/ / /
| * | | Merged stable into defaultEmile Joubert2013-04-1070-2005/+3737
| |\ \ \ | | |_|/ | |/| |
| | * | merge bug25487 into defaultTim Watson2013-04-051-2/+10
| | |\ \ | | | |/ | | |/|
| | | * client_sup API changebug25487Emile Joubert2013-04-051-2/+4
| | | * merge default into bug25487Tim Watson2013-04-051-2/+8
| | | |\ | | |/ /
| | | * Change client_sup APIEmile Joubert2013-04-043-13/+15
| | | * rabbit_client_sup accepts supervision optionsEmile Joubert2013-03-143-8/+12
| | * | Merged bug25499 into defaultEmile Joubert2013-03-272-2/+14
| | |\ \
| | | * | Check if the rabbit process is running and thus avoid deadlocks in the applic...bug25499Simon MacMullen2013-03-222-2/+11
| | | * | Merge in default.Simon MacMullen2013-03-2212-306/+436
| | | |\ \
| | * | \ \ Merged bug25491 into defaultEmile Joubert2013-03-2719-397/+732
| | |\ \ \ \
| | | * \ \ \ Merge bug24114 into defaultEmile Joubert2013-03-260-0/+0
| | | |\ \ \ \
| | | * \ \ \ \ Merged default into bug24114bug24114Emile Joubert2013-03-2549-743/+1583
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | merge bug23749 into defaultMatthias Radestock2013-03-225-62/+255
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | | * | | Update essay for credit (and fix a few typos I couldn't be bothered to separa...bug23749Simon MacMullen2013-03-221-12/+26
| | | | | * | | Move serial arithmetic out of the broker.Simon MacMullen2013-03-222-75/+0
| | | | | * | | get rid of unused importsMatthias Radestock2013-03-211-2/+0
| | | | | * | | fix typoMatthias Radestock2013-03-211-1/+1
| | | | | * | | cosmetic(ish)Matthias Radestock2013-03-212-14/+11
| | | | | * | | re-introduce state-transition optimisation for possibly_unblockMatthias Radestock2013-03-211-23/+27
| | | | | * | | Merge in defaultSimon MacMullen2013-03-219-42/+81
| | | | | |\ \ \
| | | | | * \ \ \ Merge bug23749+bug25461 into bug23749Simon MacMullen2013-03-210-0/+0
| | | | | |\ \ \ \
| | | | | * | | | | suspended =/= has run out of credit.bug23749+bug25461Simon MacMullen2013-03-211-1/+1
| | | | | * | | | | Cosmetic, reduce distance to bug25461, remove dead commentSimon MacMullen2013-03-212-16/+11
| | | | | * | | | | oopsSimon MacMullen2013-03-211-1/+1
| | | | | * | | | | Merge the two can_sends and tidy up.Simon MacMullen2013-03-212-42/+25
| | | | | * | | | | First attempt at merging these two bugs; this compiles at least.Simon MacMullen2013-03-209-50/+362
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Merge in defaultSimon MacMullen2013-03-206-53/+322
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ merge default into bug23749Matthias Radestock2013-02-210-0/+0
| | | | | | | |\ \ \ \
| | | | | | | * | | | | Well, that was embarassing.Simon MacMullen2013-02-211-1/+1