summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #6290 from vespa-engine/hmusum/cleanupJon Bratseth2018-06-273-53/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Simplify and clean upHarald Musum2018-06-273-53/+11
|/ / /
* | | Merge pull request #6287 from vespa-engine/bratseth/dont-fail-allocation-on-b...Harald Musum2018-06-2749-180/+279
|\ \ \
| * | | Don't fail on out of capacity on bootstrapJon Bratseth2018-06-2641-168/+261
| * | | Nonfunctional changes onlyJon Bratseth2018-06-261-1/+1
| * | | Nonfunctional changes onlyJon Bratseth2018-06-267-11/+17
* | | | Merge pull request #6289 from vespa-engine/gjoranv/java9-prep-12_3Harald Musum2018-06-278-28/+72
|\ \ \ \
| * | | | Exclude jaxb-api from config-model-fat.gjoranv2018-06-271-0/+7
| * | | | Java 9: Add dependencies and exports needed for jaxb support.gjoranv2018-06-276-24/+41
| * | | | Java 9: Support extension bundles in integration tests.gjoranv2018-06-261-4/+24
|/ / / /
* | | | Merge pull request #6282 from vespa-engine/gjoranv/cleanup-fat-model-depsHarald Musum2018-06-261-55/+0
|\ \ \ \
| * | | | Remove unnecessary dependencies.gjoranv2018-06-261-55/+0
| | |_|/ | |/| |
* | | | Merge pull request #6280 from vespa-engine/gjoranv/obtain-bundle-timeoutHarald Musum2018-06-261-1/+1
|\ \ \ \
| * | | | Increase timeout when waiting for bundles to one week.gjoranv2018-06-261-1/+1
* | | | | Merge pull request #6288 from vespa-engine/revert-6279-gjoranv/java9-prep-12_2gjoranv2018-06-268-72/+28
|\ \ \ \ \
| * | | | | Revert "Gjoranv/java9 prep 12 2"Harald Musum2018-06-268-72/+28
|/ / / / /
* | | | | Merge pull request #6283 from vespa-engine/mpolden/check-zone-app-convergenceMartin Polden2018-06-266-3/+81
|\ \ \ \ \
| * | | | | Require zone-application config to converge when upgradingMartin Polden2018-06-266-3/+81
| | |/ / / | |/| | |
* | | | | Merge pull request #6277 from vespa-engine/geirst/ensure-fast-search-struct-f...Geir Storli2018-06-269-97/+166
|\ \ \ \ \
| * | | | | Ensure that all attribute iterators expose the search context creating the it...Geir Storli2018-06-259-97/+166
* | | | | | Merge pull request #6272 from vespa-engine/ovirtanen/remove-scala-from-pomsOlli Virtanen2018-06-269-153/+0
|\ \ \ \ \ \
| * | | | | | Remove Scala remnants from Maven build filesOlli Virtanen2018-06-259-153/+0
| |/ / / / /
* | | | | | Merge pull request #6279 from vespa-engine/gjoranv/java9-prep-12_2gjoranv2018-06-268-28/+72
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Exclude jaxb-api from config-model-fat.gjoranv2018-06-251-0/+7
| * | | | | Java 9: Add dependencies and exports needed for jaxb support.gjoranv2018-06-256-24/+41
| * | | | | Java 9: Support fragment bundles in integration tests.gjoranv2018-06-251-4/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #6276 from vespa-engine/arnej/doubleformatter-not-neededJon Bratseth2018-06-2517-722/+50
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | slight changes in JSON formatting of doubles nowArne Juul2018-06-253-9/+9
| * | | | mark obsolete classes as DeprecatedArne Juul2018-06-255-3/+5
| * | | | stop using DoubleParserArne Juul2018-06-252-6/+2
| * | | | stop using DoubleFormatterArne Juul2018-06-257-17/+13
| * | | | use standard methods in Double Parser and FormatterArne Juul2018-06-253-687/+21
* | | | | Merge pull request #6273 from vespa-engine/hakonhall/avoid-fatal-first-cc-req...Håkon Hallingstad2018-06-254-9/+32
|\ \ \ \ \
| * | | | | Correct share-remaining-timeHåkon Hallingstad2018-06-251-1/+1
| * | | | | Remove unused methodHåkon Hallingstad2018-06-251-4/+0
| * | | | | Avoid fatal first CC request timeoutHåkon Hallingstad2018-06-254-9/+36
| |/ / / /
* | | | | Merge pull request #6275 from vespa-engine/revert-6269-gjoranv/java9-prep-12Arnstein Ressem2018-06-257-65/+28
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Revert "Gjoranv/java9 prep 12"gjoranv2018-06-257-65/+28
|/ / / /
* | | | Merge pull request #6274 from vespa-engine/bratseth/nonfunctional-changes-onlyHarald Musum2018-06-257-44/+43
|\ \ \ \
| * | | | Nonfunctional changesJon Bratseth2018-06-257-44/+43
|/ / / /
* | | | Merge pull request #6269 from vespa-engine/gjoranv/java9-prep-12gjoranv2018-06-257-28/+65
|\ \ \ \ | |/ / / |/| | |
| * | | Java 9: Add dependencies and exports needed for jaxb support.gjoranv2018-06-256-24/+41
| * | | Java 9: Support fragment bundles in integration tests.gjoranv2018-06-251-4/+24
* | | | Merge pull request #6266 from vespa-engine/hakonhall/set-node-state-timeout-i...Håkon Hallingstad2018-06-2517-43/+175
|\ \ \ \ | |_|/ / |/| | |
| * | | Move timeout query param parsing out of JsonReaderHåkon Hallingstad2018-06-253-44/+33
| * | | set-node-state timeout in CCHåkon Hallingstad2018-06-2217-43/+186
* | | | Merge pull request #6270 from vespa-engine/hmusum/build-model-for-wanted-vesp...Jon Bratseth2018-06-256-58/+67
|\ \ \ \
| * | | | Make sure to build config model for wanted vespa version as wellHarald Musum2018-06-256-58/+67
|/ / / /
* | | | Merge pull request #6258 from vespa-engine/ovirtanen/convert-scala-to-java-in...Olli Virtanen2018-06-2548-3231/+4064
|\ \ \ \ | |_|_|/ |/| | |
| * | | Class constant Logger moved to topOlli Virtanen2018-06-211-2/+2