Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Align members | Henning Baldersheim | 2017-09-05 | 3 | -6/+2 |
* | WE must listen to everyone who wants to stop. | Henning Baldersheim | 2017-09-05 | 6 | -28/+19 |
* | Request shutdown instead of doing a std::quick_exit. | Henning Baldersheim | 2017-09-05 | 1 | -3/+2 |
* | Merge pull request #3332 from vespa-engine/revert-3325-balder/request-shutdow... | Henning Baldersheim | 2017-09-05 | 1 | -2/+3 |
|\ | |||||
| * | Revert "Request shutdown instead of doing a std::quick_exit." | Henning Baldersheim | 2017-09-05 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #3331 from vespa-engine/vekterli/evict-merge-throttler-que... | Tor Brede Vekterli | 2017-09-05 | 3 | -10/+45 |
|\ | |||||
| * | Evict all queued merges from throttler on backpressure | Tor Brede Vekterli | 2017-09-05 | 3 | -10/+45 |
* | | Merge pull request #3328 from vespa-engine/mpolden/remove-fest-assert | Jon Bratseth | 2017-09-05 | 4 | -37/+38 |
|\ \ | |||||
| * | | Remove fest-assert | Martin Polden | 2017-09-05 | 4 | -37/+38 |
* | | | Merge pull request #3330 from vespa-engine/bjorncs/tagging | Bjørn Christian Seime | 2017-09-05 | 1 | -4/+0 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ | |||||
| * | | | 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 |
* | | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 vespa-engine/balder/request-shutdown-instead-of... | Tor Brede Vekterli | 2017-09-05 | 1 | -3/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Request shutdown instead of doing a std::quick_exit. | Henning Baldersheim | 2017-09-05 | 1 | -3/+2 |
* | | | | | Merge pull request #3287 from vespa-engine/revert-3275-revert-3260-hmusum/rem... | gjoranv | 2017-09-05 | 117 | -120/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from... | Harald Musum | 2017-08-31 | 135 | -401/+586 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from... | Harald Musum | 2017-08-30 | 14 | -132/+266 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 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 | valerijf | 2017-09-04 | 2 | -8/+84 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #3324 from vespa-engine/bratseth/dont-install-deploy-appli... | Harald Musum | 2017-09-05 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | Jon Bratseth | 2017-09-05 | 2 | -1/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3322 from vespa-engine/revert-3317-arnej/avoid-java-doubl... | Henning Baldersheim | 2017-09-04 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 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 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | 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 th... | Henning Baldersheim | 2017-09-04 | 1 | -21/+29 |
* | | | | | | | Merge pull request #3317 from vespa-engine/arnej/avoid-java-double-formatter | Henning Baldersheim | 2017-09-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | use Relevance.toString() | Arne Juul | 2017-09-04 | 1 | -1/+2 |
* | | | | | | | Merge pull request #3316 from vespa-engine/gjoranv/exclude-antlr-2 | Bjørn Christian Seime | 2017-09-04 | 5 | -5/+50 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add direct dependency on predicate-search-core | gjoranv | 2017-09-01 | 1 | -1/+6 |
| * | | | | | | | Make antlr and antlr4 invisible for customer projects. | gjoranv | 2017-09-01 | 4 | -4/+44 |
* | | | | | | | | Merge pull request #3297 from vespa-engine/vekterli/merge-throttling-on-provi... | Tor Brede Vekterli | 2017-09-04 | 21 | -263/+603 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |