summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bug25225Simon MacMullen2012-10-162-102/+55
|\
| * merge slave 'confirm' decision making and actionMatthias Radestock2012-10-151-31/+21
| * refactor: handle all msg statuses uniformlyMatthias Radestock2012-10-151-6/+1
| * refactor: deal with 'publish' and 'publish_delivered' in separate clausesMatthias Radestock2012-10-151-12/+11
| * refactor: extract commonality between 'publish' and 'discard'Matthias Radestock2012-10-151-73/+30
| * deal with confirms in slave 'discard'Matthias Radestock2012-10-151-2/+14
| * merge default into bug25225Matthias Radestock2012-10-151-11/+9
| |\
| * \ merge default into bug25225Matthias Radestock2012-10-123-79/+61
| |\ \
| * | | optimise x-message-ttl=0 & confirms path on queueMatthias Radestock2012-10-121-14/+10
* | | | remove comment that doesn't make any sense and is irrelevantMatthias Radestock2012-10-161-2/+0
* | | | merge headsMatthias Radestock2012-10-161-1/+1
|\ \ \ \
| * | | | TypoSimon MacMullen2012-10-161-1/+1
* | | | | refactor: don't track slave's master_pid separatelyMatthias Radestock2012-10-161-18/+16
|/ / / /
* | | | refactor: slightly more sensible signature for add_slaveMatthias Radestock2012-10-161-6/+8
* | | | refactor: correct confusing variable namingMatthias Radestock2012-10-161-6/+6
* | | | merge bug25207 into defaultTim Watson2012-10-150-0/+0
|\ \ \ \ | | |_|/ | |/| |
* | | | merge default (again)Tim Watson2012-10-151-11/+9
|\ \ \ \ | |/ / /
| * | | Merge bug25226Simon MacMullen2012-10-150-0/+0
| |\ \ \ | | | |/ | | |/|
| * | | plug leakMatthias Radestock2012-10-131-11/+9
| |/ /
* | | merge defaultTim Watson2012-10-1511-211/+344
|\ \ \ | |/ /
| * | correct essay & comments regarding the 'delayed confirm' rationaleMatthias Radestock2012-10-122-23/+22
| * | store less in the slave's msg_id_statusMatthias Radestock2012-10-121-20/+16
| * | refactor: simplify confirm handling in queueMatthias Radestock2012-10-121-31/+19
| * | cosmeticMatthias Radestock2012-10-121-3/+2
| * | re-instate TODOMatthias Radestock2012-10-121-0/+1
| * | a spot of inliningMatthias Radestock2012-10-121-15/+10
| |/
| * Merge headsSimon MacMullen2012-10-121-2/+4
| |\
| | * Merge bug25222Simon MacMullen2012-10-120-0/+0
| | |\
| | * | monitor channel on discardMatthias Radestock2012-10-121-2/+4
| | |/
| * | merge bug25192 into defaultTim Watson2012-10-120-0/+0
| |\ \
| * \ \ merge default (again)Tim Watson2012-10-122-18/+11
| |\ \ \ | | |/ /
| | * | Merged bug25195 into defaultEmile Joubert2012-10-126-33/+172
| | |\ \ | | | |/
| | * | Merge defaultSimon MacMullen2012-10-104-44/+44
| | |\ \
| | * | | Unused var.Simon MacMullen2012-10-091-1/+0
| | * | | Remove this master_changed nonsense.Simon MacMullen2012-10-092-13/+0
| | * | | Ignore process_death, explain why.Simon MacMullen2012-10-091-4/+11
| * | | | Unused variable.Simon MacMullen2012-10-121-1/+1
| * | | | Merge in defaultSimon MacMullen2012-10-1210-91/+230
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug 25110 broke ability to invoke "rabbitmqctl stop_app; rabbitmqctl status"....Simon MacMullen2012-10-111-2/+5
| | * | | remove a remnant of 'immediate'Matthias Radestock2012-10-111-10/+4
| | * | | better typesMatthias Radestock2012-10-111-3/+4
| | * | | merge bug25110 into defaultMatthias Radestock2012-10-112-1/+127
| | |\ \ \
| | | * | | Remove rabbit_misc:interval_operation/3, it doesn't really work.Simon MacMullen2012-10-091-13/+0
| | | * | | cosmetic: trains stationMatthias Radestock2012-10-081-2/+2
| | | * | | correct type signatureMatthias Radestock2012-10-041-2/+1
| | | * | | cosmeticMatthias Radestock2012-10-041-11/+15
| | | * | | Various tweaks.Simon MacMullen2012-10-022-35/+36
| | | * | | Merge defaultSimon MacMullen2012-10-022-1/+136
| | | |\ \ \
| | | | * | | interval_operation/3Simon MacMullen2012-09-271-2/+15
| | | | * | | Work on older Erlangs.Simon MacMullen2012-09-271-1/+1