summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pause/resume heartbeat monitor as requiredMatthias Radestock2010-08-022-11/+43
* remove unused typeMatthias Radestock2010-08-021-1/+0
* merge default into bug23027Matthias Radestock2010-08-020-0/+0
|\
| * merge headsMatthias Radestock2010-08-021-56/+60
| |\
* | \ merge headsMatthias Radestock2010-08-021-56/+60
|\ \ \ | | |/ | |/|
| * | merge bug23034 into defaultAlexandru Scvortov2010-07-301-56/+60
| |\ \
| | * | tweaks to heartbeaterMatthias Radestock2010-07-301-56/+60
| |/ /
* | | react to memory pressure by pausing socket receiveMatthias Radestock2010-08-022-89/+30
| |/ |/|
* | cosmeticMatthias Radestock2010-08-021-2/+1
* | Merge bug14647Michael Bridgen2010-08-023-1/+31
|\ \
| * \ Merge default to get json filename changesMichael Bridgen2010-08-0124-358/+510
| |\ \ | |/ / |/| |
* | | merge bug22886 into defaultMatthias Radestock2010-07-301-18/+15
|\ \ \
| * \ \ merge default into bug22886Matthias Radestock2010-07-3052-499/+6634
| |\ \ \ | |/ / / |/| | |
* | | | Merge amqp_0_9_1 into defaultSimon MacMullen2010-07-300-0/+0
|\ \ \ \
| * \ \ \ Merge default into amqp_0_9_1Simon MacMullen2010-07-3038-198/+6197
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | merge bug22889 into defaultMatthias Radestock2010-07-3016-248/+286
|\ \ \ \ \
| * \ \ \ \ Merge default into bug22889.Simon MacMullen2010-07-3038-198/+6197
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merging bug 23032 onto defaultMatthew Sackman2010-07-306-36/+32
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | consistently return {ok, Pid} from start_{link} functionsMatthias Radestock2010-07-296-36/+32
|/ / / / /
* | | | | merge bug21396 into defaultMatthias Radestock2010-07-293-18/+189
|\ \ \ \ \
| * | | | | simplifying refactorMatthias Radestock2010-07-291-16/+14
| * | | | | remove unnecessary exportMatthias Radestock2010-07-291-1/+1
| * | | | | Extend test coverage of delayed restart to simple case and fix exposed bugMatthew Sackman2010-07-292-9/+22
| * | | | | reduce time taken by testsMatthias Radestock2010-07-291-4/+4
| * | | | | Added test for delayed restart in supervisor2Matthew Sackman2010-07-272-0/+87
| * | | | | Merging default into bug 21396Matthew Sackman2010-07-2722-26/+5814
| |\ \ \ \ \
| * | | | | | Merge the timed/delayed restart code originally from supervisor3 in shovel in...Matthew Sackman2010-07-201-18/+91
* | | | | | | Merging bug 22973 onto defaultMatthew Sackman2010-07-295-52/+2
|\ \ \ \ \ \ \
| * | | | | | | application:get_env/2 -> application:get_env/1Alexandru Scvortov2010-07-191-1/+1
| * | | | | | | moved rabbitmq_cluster.config into the cluster_nodes field of rabbit in rabbi...Alexandru Scvortov2010-07-195-52/+2
| | | | * | | | Cherry-pick the last differences between bug 22889 and amqp_0_9_1.Simon MacMullen2010-07-202-14/+22
| | | | * | | | Merged default into bug 22889Simon MacMullen2010-07-2015-81/+182
| | | | |\ \ \ \
| | | | | | * | | Make more consistent with bug 22889 - see comment 83 on that bugSimon MacMullen2010-07-202-1/+3
| | | | | | * | | Merge default into amqp_0_9_1Simon MacMullen2010-07-2015-81/+182
| | | | | | |\ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | | * | | This function was merged wrong; fix.Simon MacMullen2010-07-201-10/+19
| | | | | | * | | Merge bug22889 into amqp_0_9_1Simon MacMullen2010-07-2054-906/+1228
| | | | | | |\ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Remove maybe_encode_propertiesSimon MacMullen2010-07-091-21/+8
| | | | * | | | | version should come firstMatthias Radestock2010-07-091-7/+6
| | | | * | | | | export protocol/0 typeMatthias Radestock2010-07-091-2/+2
| | | | * | | | | put the 'none' check back into ensure_content_encodedMatthias Radestock2010-07-091-1/+3
| | | | * | | | | This wiped out rabbit_framing_channel. Never mind.Simon MacMullen2010-07-091-1/+1
| | | | * | | | | Merge default into bug22889Simon MacMullen2010-07-0948-539/+792
| | | | |\ \ \ \ \
| | | | * | | | | | Don't change the signature of ensure_content_decoded.Simon MacMullen2010-07-093-8/+9
| | | | * | | | | | Fix idiocySimon MacMullen2010-07-091-1/+1
| | | | * | | | | | Make sure one does not accidentally build a server containing old rabbit_fram...Simon MacMullen2010-07-091-1/+1
| | | | * | | | | | Store protocol with encoded properties, use it to transcode if needed.Simon MacMullen2010-07-096-19/+30
| | | | * | | | | | More renaming.Simon MacMullen2010-07-071-2/+2
| | | | * | | | | | --allow-overwrite became --allow-accumulate.Simon MacMullen2010-07-071-2/+2
| | | | * | | | | | merge default into bug22889Matthias Radestock2010-07-061-22/+19
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Rename unknown protocol to none, fix tests.Simon MacMullen2010-07-051-1/+3
View Lorry Controller Status