summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add preferred Orchestrator lockHåkon Hallingstad2017-09-064-55/+89
|
* Merge pull request #3328 from vespa-engine/mpolden/remove-fest-assertJon Bratseth2017-09-054-37/+38
|\ | | | | Remove fest-assert from controller-server
| * Remove fest-assertMartin Polden2017-09-054-37/+38
| | | | | | | | One test library is sufficient.
* | Merge pull request #3330 from vespa-engine/bjorncs/taggingBjørn Christian Seime2017-09-051-4/+0
|\ \ | | | | | | Don't create duplicate tag
| * | Don't create duplicate tagBjørn Christian Seime2017-09-051-4/+0
|/ /
* | Merge pull request #3329 from vespa-engine/gjoranv/createClassNamegjoranv2017-09-056-18/+57
|\ \ | | | | | | Gjoranv/create class name
| * | Keep using the deprecated createClassName method for now.gjoranv2017-09-053-7/+6
| | |
| * | Rewrite ConfigGenerator.createClassName to Java.gjoranv2017-09-057-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-rpmBjørn Christian Seime2017-09-051-4/+9
|\ \ \ | | | | | | | | Use git ref, which must be supplied
| * | | Create and push git tag for releaseBjørn Christian Seime2017-09-051-0/+4
| | | |
| * | | Use git ref, which must be suppliedJon Marius Venstad2017-09-041-4/+5
| | | |
* | | | Merge pull request #3325 from ↵Tor Brede Vekterli2017-09-051-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 Baldersheim2017-09-051-3/+2
| | | |
* | | | Merge pull request #3287 from ↵gjoranv2017-09-05117-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 Musum2017-08-31135-401/+586
| |\ \ \ \ | | | | | | | | | | | | | | | | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files
| * \ \ \ \ Merge branch 'master' into ↵Harald Musum2017-08-3014-132/+266
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files
| * | | | | | Update test after removing version lineHarald Musum2017-08-301-2/+1
| | | | | | |
| * | | | | | Revert "Revert "version in def files are deprecated""Harald Musum2017-08-30116-118/+0
| | | | | | |
* | | | | | | Merge pull request #3321 from vespa-engine/freva/image-pull-async-bugValerij Fredriksen2017-09-052-8/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix pull async bug, add test
| * | | | | | | Fix pull async bug, add testvalerijf2017-09-042-8/+84
| | | | | | | |
* | | | | | | | Merge pull request #3324 from ↵Harald Musum2017-09-051-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/bratseth/dont-install-deploy-application Skip Vespa 5 compatibility script
| * | | | | | | | Skip Vespa 5 compatibility scriptJon Bratseth2017-09-051-1/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #3326 from vespa-engine/bratseth/dont-install-jdisc-logfmtKristian Aune2017-09-052-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Don't install jdisck logfmt variant
| * | | | | | | Don't install jdisck logfmt variantJon Bratseth2017-09-052-1/+2
|/ / / / / / /
* | | | | | | Merge pull request #3322 from ↵Henning Baldersheim2017-09-041-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-3317-arnej/avoid-java-double-formatter Revert "use Relevance.toString()"
| * | | | | | | Revert "use Relevance.toString()"Henning Baldersheim2017-09-041-2/+1
|/ / / / / / /
* | | | | | | Merge pull request #3320 from vespa-engine/bjorncs/versioned-secretsMartin Polden2017-09-041-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Support KeyService impls with versioned secrets
| * | | | | | | Support KeyService impls with versioned secretsBjørn Christian Seime2017-09-041-0/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #3313 from vespa-engine/balder/try-to-shutdown-controlledHenning Baldersheim2017-09-041-22/+39
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Try to shut down fleetcontroller in a controlled manner without relyi…
| * | | | | | Do not use import x.y.*;Henning Baldersheim2017-09-041-1/+10
| | | | | | |
| * | | | | | Try to shut down fleetcontroller in a controlled manner without relying on ↵Henning Baldersheim2017-09-041-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the infamous thread.interrupt.
* | | | | | | Merge pull request #3317 from vespa-engine/arnej/avoid-java-double-formatterHenning Baldersheim2017-09-041-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | use Relevance.toString()
| * | | | | | use Relevance.toString()Arne Juul2017-09-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * avoids costly Double.toString() for JSON rendering
* | | | | | | Merge pull request #3316 from vespa-engine/gjoranv/exclude-antlr-2Bjørn Christian Seime2017-09-045-5/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Gjoranv/exclude antlr 2
| * | | | | | | Add direct dependency on predicate-search-coregjoranv2017-09-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. to force inclusion of antlr-runtime, which is now excluded from container-dev.
| * | | | | | | Make antlr and antlr4 invisible for customer projects.gjoranv2017-09-014-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Visible only in test classpath.
* | | | | | | | Merge pull request #3297 from ↵Tor Brede Vekterli2017-09-0421-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 codeTor Brede Vekterli2017-09-012-11/+16
| | | | | | | | |
| * | | | | | | | Remove TODO that probably won't be neededTor Brede Vekterli2017-09-011-1/+0
| | | | | | | | |
| * | | | | | | | Don't perform expression-embedded variable assignmentTor Brede Vekterli2017-09-011-2/+2
| | | | | | | | |
| * | | | | | | | Update function name to reflect current semantics of fatal errorsTor Brede Vekterli2017-08-312-3/+3
| | | | | | | | |
| * | | | | | | | De-dupe some error listener test codeTor Brede Vekterli2017-08-314-23/+12
| | | | | | | | |
| * | | | | | | | Wire together new listener to propagate errorsTor Brede Vekterli2017-08-3117-117/+210
| | | | | | | | |
| * | | | | | | | Generalize SPI shutdown wrapper into error source for listenersTor Brede Vekterli2017-08-305-74/+239
| | | | | | | | |
| * | | | | | | | Do not throttle source only merges during back-pressureTor Brede Vekterli2017-08-303-6/+34
| | | | | | | | |
| * | | | | | | | Add backpressure to MergeThrottler with configurable timingTor Brede Vekterli2017-08-305-55/+131
| | | | | | | | |
| * | | | | | | | Style changes and C++11-ificationTor Brede Vekterli2017-08-301-39/+24
| | | | | | | | |
* | | | | | | | | Merge pull request #3315 from vespa-engine/freva/fix-image-pullValerij Fredriksen2017-09-049-101/+41
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Fix docker image pull retry
| * | | | | | | | Fix docker image pull retryvalerijf2017-09-049-101/+41
|/ / / / / / / /
* | | | | | | | Merge pull request #3312 from vespa-engine/hmusum/catch-throwablegjoranv2017-09-041-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Catch errors too