Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add preferred Orchestrator lock | Håkon Hallingstad | 2017-09-06 | 4 | -55/+89 |
| | |||||
* | Merge pull request #3328 from vespa-engine/mpolden/remove-fest-assert | Jon Bratseth | 2017-09-05 | 4 | -37/+38 |
|\ | | | | | Remove fest-assert from controller-server | ||||
| * | Remove fest-assert | Martin Polden | 2017-09-05 | 4 | -37/+38 |
| | | | | | | | | One test library is sufficient. | ||||
* | | Merge pull request #3330 from vespa-engine/bjorncs/tagging | Bjørn Christian Seime | 2017-09-05 | 1 | -4/+0 |
|\ \ | | | | | | | Don't create duplicate tag | ||||
| * | | Don't create duplicate tag | Bjørn Christian Seime | 2017-09-05 | 1 | -4/+0 |
|/ / | |||||
* | | Merge pull request #3329 from vespa-engine/gjoranv/createClassName | gjoranv | 2017-09-05 | 6 | -18/+57 |
|\ \ | | | | | | | Gjoranv/create class name | ||||
| * | | Keep using the deprecated createClassName method for now. | gjoranv | 2017-09-05 | 3 | -7/+6 |
| | | | |||||
| * | | Rewrite ConfigGenerator.createClassName to Java. | gjoranv | 2017-09-05 | 7 | -24/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - In new class ConfiggenUtil. - This will allow using the function without loading classes from scala-xml in the future. - Do not remove the original scala method, as it could still be used for a while by older config models. (By classes InstanceResolver and VespaModel.) | ||||
* | | | Merge pull request #3319 from vespa-engine/jvenstad/use-git-ref-not-tag-for-rpm | Bjørn Christian Seime | 2017-09-05 | 1 | -4/+9 |
|\ \ \ | | | | | | | | | Use git ref, which must be supplied | ||||
| * | | | Create and push git tag for release | Bjørn Christian Seime | 2017-09-05 | 1 | -0/+4 |
| | | | | |||||
| * | | | Use git ref, which must be supplied | Jon Marius Venstad | 2017-09-04 | 1 | -4/+5 |
| | | | | |||||
* | | | | Merge pull request #3325 from ↵ | Tor Brede Vekterli | 2017-09-05 | 1 | -3/+2 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | vespa-engine/balder/request-shutdown-instead-of-quick-exit Request shutdown instead of doing a std::quick_exit. | ||||
| * | | | Request shutdown instead of doing a std::quick_exit. | Henning Baldersheim | 2017-09-05 | 1 | -3/+2 |
| | | | | |||||
* | | | | Merge pull request #3287 from ↵ | gjoranv | 2017-09-05 | 117 | -120/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-3275-revert-3260-hmusum/remove-version-from-def-files Revert 3275 revert 3260 hmusum/remove version from def files | ||||
| * \ \ \ | Merge branch 'master' into ↵ | Harald Musum | 2017-08-31 | 135 | -401/+586 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files | ||||
| * \ \ \ \ | Merge branch 'master' into ↵ | Harald Musum | 2017-08-30 | 14 | -132/+266 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files | ||||
| * | | | | | | Update test after removing version line | Harald Musum | 2017-08-30 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Revert "Revert "version in def files are deprecated"" | Harald Musum | 2017-08-30 | 116 | -118/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3321 from vespa-engine/freva/image-pull-async-bug | Valerij Fredriksen | 2017-09-05 | 2 | -8/+84 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix pull async bug, add test | ||||
| * | | | | | | | Fix pull async bug, add test | valerijf | 2017-09-04 | 2 | -8/+84 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3324 from ↵ | Harald Musum | 2017-09-05 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/bratseth/dont-install-deploy-application Skip Vespa 5 compatibility script | ||||
| * | | | | | | | | Skip Vespa 5 compatibility script | Jon Bratseth | 2017-09-05 | 1 | -1/+0 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #3326 from vespa-engine/bratseth/dont-install-jdisc-logfmt | Kristian Aune | 2017-09-05 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Don't install jdisck logfmt variant | ||||
| * | | | | | | | Don't install jdisck logfmt variant | Jon Bratseth | 2017-09-05 | 2 | -1/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3322 from ↵ | Henning Baldersheim | 2017-09-04 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-3317-arnej/avoid-java-double-formatter Revert "use Relevance.toString()" | ||||
| * | | | | | | | Revert "use Relevance.toString()" | Henning Baldersheim | 2017-09-04 | 1 | -2/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3320 from vespa-engine/bjorncs/versioned-secrets | Martin Polden | 2017-09-04 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Support KeyService impls with versioned secrets | ||||
| * | | | | | | | Support KeyService impls with versioned secrets | Bjørn Christian Seime | 2017-09-04 | 1 | -0/+5 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #3313 from vespa-engine/balder/try-to-shutdown-controlled | Henning Baldersheim | 2017-09-04 | 1 | -22/+39 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Try to shut down fleetcontroller in a controlled manner without relyi… | ||||
| * | | | | | | Do not use import x.y.*; | Henning Baldersheim | 2017-09-04 | 1 | -1/+10 |
| | | | | | | | |||||
| * | | | | | | Try to shut down fleetcontroller in a controlled manner without relying on ↵ | Henning Baldersheim | 2017-09-04 | 1 | -21/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the infamous thread.interrupt. | ||||
* | | | | | | | Merge pull request #3317 from vespa-engine/arnej/avoid-java-double-formatter | Henning Baldersheim | 2017-09-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | use Relevance.toString() | ||||
| * | | | | | | use Relevance.toString() | Arne Juul | 2017-09-04 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * avoids costly Double.toString() for JSON rendering | ||||
* | | | | | | | Merge pull request #3316 from vespa-engine/gjoranv/exclude-antlr-2 | Bjørn Christian Seime | 2017-09-04 | 5 | -5/+50 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Gjoranv/exclude antlr 2 | ||||
| * | | | | | | | Add direct dependency on predicate-search-core | gjoranv | 2017-09-01 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. to force inclusion of antlr-runtime, which is now excluded from container-dev. | ||||
| * | | | | | | | Make antlr and antlr4 invisible for customer projects. | gjoranv | 2017-09-01 | 4 | -4/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Visible only in test classpath. | ||||
* | | | | | | | | Merge pull request #3297 from ↵ | Tor Brede Vekterli | 2017-09-04 | 21 | -263/+603 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/vekterli/merge-throttling-on-provider-resource-exhaustion Throttle new merges for configurable duration on provider resource exhaustion | ||||
| * | | | | | | | | De-dupe backpressure mode checking code | Tor Brede Vekterli | 2017-09-01 | 2 | -11/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove TODO that probably won't be needed | Tor Brede Vekterli | 2017-09-01 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Don't perform expression-embedded variable assignment | Tor Brede Vekterli | 2017-09-01 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Update function name to reflect current semantics of fatal errors | Tor Brede Vekterli | 2017-08-31 | 2 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | De-dupe some error listener test code | Tor Brede Vekterli | 2017-08-31 | 4 | -23/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | Wire together new listener to propagate errors | Tor Brede Vekterli | 2017-08-31 | 17 | -117/+210 |
| | | | | | | | | | |||||
| * | | | | | | | | Generalize SPI shutdown wrapper into error source for listeners | Tor Brede Vekterli | 2017-08-30 | 5 | -74/+239 |
| | | | | | | | | | |||||
| * | | | | | | | | Do not throttle source only merges during back-pressure | Tor Brede Vekterli | 2017-08-30 | 3 | -6/+34 |
| | | | | | | | | | |||||
| * | | | | | | | | Add backpressure to MergeThrottler with configurable timing | Tor Brede Vekterli | 2017-08-30 | 5 | -55/+131 |
| | | | | | | | | | |||||
| * | | | | | | | | Style changes and C++11-ification | Tor Brede Vekterli | 2017-08-30 | 1 | -39/+24 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3315 from vespa-engine/freva/fix-image-pull | Valerij Fredriksen | 2017-09-04 | 9 | -101/+41 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Fix docker image pull retry | ||||
| * | | | | | | | | Fix docker image pull retry | valerijf | 2017-09-04 | 9 | -101/+41 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3312 from vespa-engine/hmusum/catch-throwable | gjoranv | 2017-09-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Catch errors too |