| commit | ad9818165e99aa122744767610f1007bebe3b3ac | [log] [tgz] |
|---|---|---|
| author | Hugo Arès <hugo.ares@ericsson.com> | Wed Mar 25 11:27:31 2015 -0400 |
| committer | Hugo Arès <hugo.ares@ericsson.com> | Wed Mar 25 11:27:31 2015 -0400 |
| tree | 8d021d7fc4802be8682bbd276242d27d94e675d5 | |
| parent | c33a9108e82ca07a7e006ffa5117492e0866cc53 [diff] | |
| parent | 61074ca4fbe7881212c6a921fb843378ed4fb124 [diff] |
Merge branch 'stable-2.10' into stable-2.11 * stable-2.10: Work around MyersDiff infinite loop in PatchListLoader Rework intra line diff to interrupt threads instead of killing them Update JGit to 3.7.0.201502260915-r.58-g65c379e Workaround a RecursiveMerger bug [1], avoid online reindexing failure Allow PatchListLoader to use recursive merger Allow plugins to use self-provided licenses for used Maven Jars Change-Id: I6e0cf4762c1519915fef0625ab26f76db3c8c02b