summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use git ref, which must be suppliedJon Marius Venstad2017-09-041-4/+5
* Merge pull request #3317 from vespa-engine/arnej/avoid-java-double-formatterHenning Baldersheim2017-09-041-1/+2
|\
| * use Relevance.toString()Arne Juul2017-09-041-1/+2
* | Merge pull request #3316 from vespa-engine/gjoranv/exclude-antlr-2Bjørn Christian Seime2017-09-045-5/+50
|\ \
| * | Add direct dependency on predicate-search-coregjoranv2017-09-011-1/+6
| * | Make antlr and antlr4 invisible for customer projects.gjoranv2017-09-014-4/+44
* | | Merge pull request #3297 from vespa-engine/vekterli/merge-throttling-on-provi...Tor Brede Vekterli2017-09-0421-263/+603
|\ \ \
| * | | 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 retryvalerijf2017-09-049-101/+41
|/ / /
* | | Merge pull request #3312 from vespa-engine/hmusum/catch-throwablegjoranv2017-09-041-1/+1
|\ \ \
| * | | Catch ThrowableHarald Musum2017-09-041-1/+1
| * | | Catch Error and log at a place where thread will otherwise die silentlyHarald Musum2017-09-042-2/+2
| * | | Catch errors tooHarald Musum2017-09-041-1/+1
* | | | Merge pull request #3306 from vespa-engine/mpolden/controller-todosJon Marius Venstad2017-09-048-69/+14
|\ \ \ \
| * | | | Fix serializaiton TODOsMartin Polden2017-09-011-34/+7
| * | | | Remove unused job report fieldsMartin Polden2017-09-017-35/+7
* | | | | Merge pull request #3295 from vespa-engine/toregge/keep-better-track-of-refer...Geir Storli2017-09-0412-82/+156
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Test that reference attribute tracks unique gids.Tor Egge2017-09-031-0/+34
| * | | | Test that gid mapper can iterate over known gids.Tor Egge2017-09-031-0/+37
| * | | | Keep track of mapping from gid to referenced lid in reference attributeTor Egge2017-08-3111-89/+92
* | | | | Merge pull request #3311 from vespa-engine/balder/split-in-weighted-nonweight...Henning Baldersheim2017-09-032-54/+77
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Simplify the loop.Henning Baldersheim2017-09-011-20/+10
| * | | | Simplify targetIterator loop.Henning Baldersheim2017-09-011-18/+8
| * | | | Reduce branch miss.Henning Baldersheim2017-09-012-3/+2
| * | | | Populate bitvector on the fly.Henning Baldersheim2017-09-011-40/+25
| * | | | Separate the weighted/non-weighted solution.Henning Baldersheim2017-09-011-27/+86
|/ / / /
* | | | Merge pull request #3309 from vespa-engine/havardpe/use-zero-rank-score-for-u...Henning Baldersheim2017-09-0111-20/+28
|\ \ \ \
| * | | | use 0.0 rank score for results when not rankingHåvard Pettersen2017-09-0111-20/+28
* | | | | Merge pull request #3299 from vespa-engine/revert-3285-arnej/render-inf-relev...Håvard Pettersen2017-09-013-7/+3
|\ \ \ \ \
| * | | | | Revert "render infinite or NaN relevance as "0.0""Henning Baldersheim2017-09-013-7/+3
* | | | | | Merge pull request #3308 from vespa-engine/revert-2934-hmusum/use-409-respons...Jon Bratseth2017-09-015-44/+15
|\ \ \ \ \ \
| * | | | | | Revert "Return 409 if there is a conflict when activating"gjoranv2017-09-015-44/+15
* | | | | | | Merge pull request #3300 from vespa-engine/balder/allow-for-efficient-bit-vec...Henning Baldersheim2017-09-014-37/+37
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Ensure large method is not inlined.Henning Baldersheim2017-09-011-0/+6
| * | | | | | I guess the 'fast-search' hint is better than the 'filter' hint.Henning Baldersheim2017-09-011-1/+1
| * | | | | | Make posting lists if it is strict or if target is filter.Henning Baldersheim2017-09-014-37/+31
| |/ / / / /
* | | | | | Merge pull request #3307 from vespa-engine/gjoranv/revert-rewrite-to-javagjoranv2017-09-017-58/+33
|\ \ \ \ \ \
| * | | | | | Revert "Rewrite ConfigGenerator.createClassName to Java."gjoranv2017-09-017-58/+33
|/ / / / / /
* | | | | | Merge pull request #3305 from vespa-engine/gjoranv/revert-exclude-scala-xmlgjoranv2017-09-015-26/+0
|\ \ \ \ \ \
| * | | | | | Revert "Exclude scala-xml from provided classpath"gjoranv2017-09-015-26/+0
|/ / / / / /