summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merged stable into defaultEmile Joubert2013-05-091-6/+8
|\
| * Merged bug25545 into stableEmile Joubert2013-05-091-1/+1
| |\
| * | Allow x-match header to be missing.Simon MacMullen2013-05-071-2/+3
| * | Treat missing / garbled x-match header as "all", like we used to.Simon MacMullen2013-05-071-4/+5
* | | stable to defaultSimon MacMullen2013-05-091-1/+1
|\ \ \ | | |/ | |/|
| * | Merge bug25549Simon MacMullen2013-05-090-0/+0
| |\ \ | | |/
| * | Clear queue expiry timer ref when firedEmile Joubert2013-05-091-1/+1
| |/
| * Merge 3.1.0 into stable.Simon MacMullen2013-05-0382-2236/+4557
| |\
* | \ merge bug25537 into defaultTim Watson2013-05-090-0/+0
|\ \ \
* \ \ \ merge default into bug25537Tim Watson2013-05-0989-2682/+5329
|\ \ \ \ | |/ / /
| * | | merge bug23958 into defaultMatthias Radestock2013-05-071-2/+3
| |\ \ \
| | * | | remove R13-ism imported from upstreamMatthias Radestock2013-05-071-2/+3
| * | | | Merge heads againSimon MacMullen2013-05-018-447/+772
| |\ \ \ \
| | * \ \ \ Merge headsSimon MacMullen2013-05-018-447/+772
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | merge bug23958 into defaultMatthias Radestock2013-05-018-447/+772
| | | |\ \ \ | | | | |/ /
| | | | * | 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
| | | | |\ \
| | | | * | | rationalise restart handlingTim Watson2013-04-161-11/+3
| | | | * | | simplify restart_if_explicit_or_abnormalTim Watson2013-04-161-4/+1
| | | | * | | drop function guards from restart_if_explicit_or_abnormalTim Watson2013-04-161-5/+2
| | | | * | | relocate is_explicit_restart macroTim Watson2013-04-161-3/+2
| | | | * | | merge default (again)Tim Watson2013-03-228-446/+783
| | | | |\ \ \
| | | | | * | | track repeated attempts to restart properlyTim Watson2013-03-111-21/+11
| | | | | * | | Translate return from do_restart properlyTim Watson2013-03-081-2/+2
| | | | | * | | Align error reporting and restart handling with OTPTim Watson2013-03-081-31/+75
| | | | | * | | merge default into bug23958Tim Watson2013-03-07148-1848/+2704
| | | | | |\ \ \
| | | | | * \ \ \ merge headsTim Watson2013-03-061-1/+1
| | | | | |\ \ \ \
| | | | | | * | | | correct commentMatthias Radestock2013-03-061-1/+1
| | | | | * | | | | Refactor try_again restart handlingTim Watson2013-03-061-25/+21
| | | | | |/ / / /
| | | | | * | | | rebase with R16BTim Watson2013-03-041-10/+15
| | | | | * | | | revert test timings back to exactly what's on defaultTim Watson2013-02-201-1/+1
| | | | | * | | | avoid badmatch in handle_info/delayed_restartTim Watson2013-02-011-4/+8
| | | | | * | | | Ensure supervisor try_again_restart observes delayed restartTim Watson2013-02-011-35/+36
| | | | | * | | | move find_child implementation to a better placeMatthias Radestock2013-01-271-9/+9
| | | | | * | | | cosmetic - indent like OTPMatthias Radestock2013-01-271-1/+1
| | | | | * | | | move bits of docs aroundMatthias Radestock2013-01-271-8/+8
| | | | | * | | | revert spurious changes to test timingsTim Watson2013-01-221-2/+2
| | | | | * | | | remove compiler warningTim Watson2012-12-071-1/+1
| | | | | * | | | merge headsTim Watson2012-12-051-1/+1
| | | | | |\ \ \ \
| | | | | | * | | | change comments to reflect merging with R15B-03Tim Watson2012-12-041-1/+1
| | | | | * | | | | infinity is always a valid shutdown reasonTim Watson2012-12-051-1/+1
| | | | | * | | | | reduce distance to OTP - pattern match in case, not-found is always 'false'Tim Watson2012-12-051-3/+2
| | | | | * | | | | oops - remember to guard specs for R12B03 compatibilityTim Watson2012-12-051-1/+2
| | | | | * | | | | reduce distance to OTP - {temporary, Delay} is not a valid restart typeTim Watson2012-12-051-10/+2
| | | | | * | | | | use ?MODULE macro when appropriateTim Watson2012-12-051-1/+1
| | | | | * | | | | cosmetic - reduce distance to OTPTim Watson2012-12-051-5/+5
| | | | | |/ / / /
| | | | | * | | | document addition of find_child/2Tim Watson2012-11-301-3/+5
View Lorry Controller Status