summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge default into bug25428bug25428Matthias Radestock2013-01-3137-1384/+2240
|\
| * remove out-of-date commentMatthias Radestock2013-01-301-2/+1
| * remove spurious generalityMatthias Radestock2013-01-291-2/+2
| * stable to defaultSimon MacMullen2013-01-291-23/+25
| |\
| * | single io:format in order to prevent output interleavingMatthias Radestock2013-01-281-4/+7
| * | stable to defaultSimon MacMullen2013-01-282-8/+4
| |\ \
| * | | Swap SASL and TLS header codesEmile Joubert2013-01-251-2/+2
| * | | Merge bug25415Simon MacMullen2013-01-250-0/+0
| |\ \ \
| * | | | nuke active_consumer_countbug25415Matthias Radestock2013-01-241-11/+3
| |/ / /
| * | | merge stable into defaultMatthias Radestock2013-01-241-2/+4
| |\ \ \
| * \ \ \ Merge headsSimon MacMullen2013-01-242-20/+39
| |\ \ \ \
| | * \ \ \ merge bug25383 into defaultMatthias Radestock2013-01-242-20/+39
| | |\ \ \ \
| | | * | | | improved connection refusal logic / error messagebug25383Matthias Radestock2013-01-242-20/+39
| | | * | | | merge default into bug25383Matthias Radestock2013-01-240-0/+0
| | | |\ \ \ \ | | |/ / / / /
| * | | | | | stable to defaultSimon MacMullen2013-01-24142-145/+145
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Quick patch to backing queue quickcheck correcting fold fun arityEmile Joubert2013-01-241-5/+6
| * | | | | | stable to defaultSimon MacMullen2013-01-2436-1358/+2200
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge bug24980 into defaultTim Watson2013-01-2317-179/+309
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge bug25394 into defaultTim Watson2013-01-225-25/+35
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge stable into defaultMatthias Radestock2013-01-221-10/+8
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ merge stable into defaultMatthias Radestock2013-01-2235-1287/+2134
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ merge bug25395 into defaultTim Watson2013-01-218-25/+54
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ stable to defaultSimon MacMullen2013-01-2135-1287/+2101
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ merge bug25397 into defaultTim Watson2013-01-216-17/+35
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ merge bug25409 into defaultTim Watson2013-01-214-3/+27
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * | | | | | | | USe pg_local rather than an ets table.Simon MacMullen2013-01-211-6/+3
| | | | | | | | * | | | | | | | cosmetic: move spec of internal function and make it more preciseMatthias Radestock2013-01-201-8/+5
| | | * | | | | | | | | | | | | populate slave's msg_id_ack with sync'ed messages pending ackbug25394Matthias Radestock2013-01-192-24/+30
| | | * | | | | | | | | | | | | eager sync of messages pending ackMatthias Radestock2013-01-195-24/+23
| | | * | | | | | | | | | | | | merge bug25409 into bug25394Matthias Radestock2013-01-199-85/+131
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | merge bug25395 into bug25394Matthias Radestock2013-01-190-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | / / / / / / / | | | | | | |_|_|/ / / / / / / | | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | | merge bug25397 into bug25395bug25395Matthias Radestock2013-01-190-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | merge default into bug25397bug25397Matthias Radestock2013-01-191-64/+57
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | merge default into bug25397Matthias Radestock2013-01-171-64/+57
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | * | | \ \ \ \ \ \ \ \ \ merge default into bug25395Matthias Radestock2013-01-194-77/+103
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | pass 'unacked' flag to BQ:fold funMatthias Radestock2013-01-154-18/+21
| | | | | * | | | | | | | | | | merge bug25397 into bug25395Matthias Radestock2013-01-152-15/+45
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | merge default into bug25395Matthias Radestock2013-01-151-23/+68
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ merge default into bug25395Matthias Radestock2013-01-141-56/+80
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | refactorMatthias Radestock2013-01-131-19/+14
| | | | | | | * | | | | | | | | | | include pending_acks in 'fold'Matthias Radestock2013-01-131-13/+46
| | | | | | | * | | | | | | | | | | merge bug25397 into bug25395Matthias Radestock2013-01-131-2/+2
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge bug25397 into bug25395Matthias Radestock2013-01-121-30/+30
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ merge default into bug25395Matthias Radestock2013-01-121-21/+24
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ merge bug25397 into bug25395Matthias Radestock2013-01-121-56/+52
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge bug25400 into bug25397Matthias Radestock2013-01-151-64/+57
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge degault into bug25397Matthias Radestock2013-01-151-23/+68
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | merge default into bug25397Matthias Radestock2013-01-141-56/+52
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / / / / / / / / / | | | | | | |/| | | | | | / / / / / / / / / / | | | | | | | | |_|_|_|_|/ / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | cosmeticMatthias Radestock2013-01-131-2/+2
| | | | | | | | |_|_|_|/ / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | only pass the minimum necessary state to 'next'Matthias Radestock2013-01-121-23/+26