summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge to default againSimon MacMullen2012-10-291-3/+3
|\
| * FormattingSimon MacMullen2012-10-291-3/+3
* | Merge bug24719Simon MacMullen2012-10-293-31/+51
|\ \ | |/
| * Shorter.Simon MacMullen2012-10-291-19/+10
| * correct docsMatthias Radestock2012-10-261-6/+7
| * remove cruft from display of missing pluginsMatthias Radestock2012-10-261-5/+16
| * we can have both missing plugins and missing dependenciesMatthias Radestock2012-10-261-7/+9
| * simplifyMatthias Radestock2012-10-261-13/+7
| * merge default into bug24719Matthias Radestock2012-10-262-17/+38
| |\
| | * merge default into bug24719Matthias Radestock2012-08-083-36/+32
| | |\
| | * | Eric's patchesMatthias Radestock2012-08-072-17/+38
* | | | Merge bug25254Simon MacMullen2012-10-291-4/+13
|\ \ \ \
| * | | | stop reading when losing frame syncMatthias Radestock2012-10-291-4/+13
* | | | | Since bug 25243 we can never have the situation described in that comment - s...Simon MacMullen2012-10-292-11/+4
|/ / / /
* | | | merge headsMatthias Radestock2012-10-261-4/+0
|\ \ \ \
| * | | | remove incorrect/out-of-date commentsMatthias Radestock2012-10-261-4/+0
| |/ / /
* | | | Merge bug 24991Simon MacMullen2012-10-264-22/+28
|\ \ \ \
| * | | | use new frame_error functionMatthias Radestock2012-07-181-3/+3
| * | | | merge default into bug24991Matthias Radestock2012-07-184-22/+28
| |\ \ \ \
| | * | | | allow clients to exceed frame size by a little bitMatthias Radestock2012-07-171-1/+6
| | * | | | merge default into bug24991Matthias Radestock2012-07-175-100/+103
| | |\ \ \ \
| | * \ \ \ \ merge default into bug24991Matthias Radestock2012-07-134-22/+23
| | |\ \ \ \ \
| | | * \ \ \ \ merge default into bug24991Matthias Radestock2012-07-134-22/+23
| | | |\ \ \ \ \
| | | | * | | | | enforce frame_maxMatthias Radestock2012-06-121-0/+5
| | | | * | | | | refactor: move constant and give it a better nameMatthias Radestock2012-06-123-22/+18
* | | | | | | | | Merged bug25243 into defaultEmile Joubert2012-10-263-85/+89
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | fix typoMatthias Radestock2012-10-261-1/+1
| * | | | | | | | merge bug25203 into defaultMatthias Radestock2012-10-251-33/+47
| |\ \ \ \ \ \ \ \
| | * | | | | | | | consistencyMatthias Radestock2012-10-251-6/+6
| | * | | | | | | | refactor 'reset'Matthias Radestock2012-10-251-26/+22
| | * | | | | | | | betternessMatthias Radestock2012-10-251-20/+14
| | * | | | | | | | typoFrancesco Mazzoli2012-10-251-1/+1
| | * | | | | | | | better error message for `join_cluster'Francesco Mazzoli2012-10-251-1/+3
| | * | | | | | | | oops pt 2Francesco Mazzoli2012-10-251-1/+1
| | * | | | | | | | `cluster_nodes(all)' instead of `nodes()' in `force_reset()'Francesco Mazzoli2012-10-251-1/+1
| | * | | | | | | | handle legacy `cluster_nodes'Francesco Mazzoli2012-10-251-2/+14
| | * | | | | | | | oopsFrancesco Mazzoli2012-10-251-2/+0
| | * | | | | | | | merge defaultFrancesco Mazzoli2012-10-253-51/+41
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merged bug25053 into defaultEmile Joubert2012-10-2585-2902/+5968
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bug25167Simon MacMullen2012-10-241-5/+7
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merged bug25237 into defaultEmile Joubert2012-10-241-5/+7
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | More accurate specs.Simon MacMullen2012-10-241-5/+7
| | | |/ / / / / / / / /
| | * | | | | | | | | | remove the `leave_cluster' refactorFrancesco Mazzoli2012-10-241-4/+6
| | * | | | | | | | | | post merge cleanupFrancesco Mazzoli2012-10-241-22/+21
| | * | | | | | | | | | oopsFrancesco Mazzoli2012-10-241-0/+1
| | * | | | | | | | | | commentFrancesco Mazzoli2012-10-241-0/+2
| | * | | | | | | | | | merged defaultFrancesco Mazzoli2012-10-241-57/+41
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | fix in change_cluster_node_typeFrancesco Mazzoli2012-09-211-1/+3
| | | * | | | | | | | | forgot about the other thunkFrancesco Mazzoli2012-09-211-3/+2
| | | * | | | | | | | | not a thunk anymoreFrancesco Mazzoli2012-09-211-3/+3