summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.139.24-1].vespa-6.139.24-1by-screwdriver2017-08-172-1/+2
* Initialized to use tito.by-screwdriver2017-08-173-0/+8
* Merge pull request #3135 from vespa-engine/balder/let-dispatch.summaries-impl...Jon Bratseth2017-08-163-29/+74
|\
| * Return an error when ranking.queryCache is not enabled when it needs to be.Henning Baldersheim2017-08-163-29/+74
* | Merge pull request #3130 from vespa-engine/aressem/put-vespamalloc-in-expecte...Henning Baldersheim2017-08-161-5/+5
|\ \
| * | Vespamalloc is expected to be in lib64/vespa/mallocArnstein Ressem2017-08-161-5/+5
* | | Merge pull request #3134 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-08-162-3/+8
|\ \ \ | |_|/ |/| |
| * | Reduce ccache size to 4GBBjørn Christian Seime2017-08-161-1/+1
| * | Reduce clone depth to 1Bjørn Christian Seime2017-08-161-0/+3
| * | Use ccache compressionBjørn Christian Seime2017-08-161-2/+2
| * | Use minimal Travis imageBjørn Christian Seime2017-08-161-1/+1
| * | Print size of Maven repository and ccacheBjørn Christian Seime2017-08-161-0/+2
|/ /
* | Merge pull request #3132 from vespa-engine/toregge/repair-reference-mapping-u...Geir Storli2017-08-161-0/+1
|\ \
| * | Properly initialize forward mapping when loading reference attribute.Tor Egge2017-08-161-0/+1
* | | Merge pull request #3129 from vespa-engine/havardpe/explicit-unbox-featureLester Solbakken2017-08-165-24/+95
|\ \ \
| * | | add simple unbox feature into test pluginHåvard Pettersen2017-08-165-24/+95
| | |/ | |/|
* | | Merge pull request #3126 from vespa-engine/toregge/report-memory-usage-also-f...Geir Storli2017-08-163-0/+13
|\ \ \ | | |/ | |/|
| * | Account for memory usage in reference mappings and generation holder.Tor Egge2017-08-163-0/+13
| |/
* | Merge pull request #3110 from vespa-engine/gjoranv/use-before-instead-of-ctorJon Bratseth2017-08-161-5/+7
|\ \
| * | Use @Before instead of ctor.gjoranv2017-08-151-5/+7
* | | Merge pull request #3128 from vespa-engine/bjorncs/fix-typoBjørn Christian Seime2017-08-161-1/+1
|\ \ \
| * | | Fix typoBjørn Christian Seime2017-08-161-1/+1
|/ / /
* | | Merge pull request #3127 from vespa-engine/bjorncs/test-debuggingBjørn Christian Seime2017-08-162-3/+2
|\ \ \ | |_|/ |/| |
| * | Don't use cppunit-parallelize.pyBjørn Christian Seime2017-08-161-2/+1
| * | Reduce max size of ccacheBjørn Christian Seime2017-08-161-1/+1
|/ /
* | Merge pull request #3123 from vespa-engine/toregge/maintain-direct-forward-ma...Geir Storli2017-08-166-19/+81
|\ \
| * | Consolidate naming: limit, numDocs => docIdLimitTor Egge2017-08-163-14/+21
| * | Maintain direct forward mapping from lid to referenced lid in referenceTor Egge2017-08-166-19/+74
* | | Merge pull request #3125 from vespa-engine/geirst/fix-deriving-of-attributes-...Geir Storli2017-08-162-9/+9
|\ \ \
| * | | Fix bug in deriving of attributes config for imported fields.Geir Storli2017-08-162-9/+9
* | | | Merge pull request #3092 from vespa-engine/revert-3091-revert-2963-smorgrav/a...Jon Bratseth2017-08-1629-649/+1177
|\ \ \ \
| * | | | More adjusting of unit tests from node-repository mock changestoby2017-08-161-4/+4
| * | | | Update unit tests in node-admin according to changes in node-repositorytoby2017-08-162-16/+18
| * | | | Adjust tests according to new allocation algorithmtoby2017-08-151-5/+5
| * | | | Revert "Revert "Allocation rewrite""Torbjørn Smørgrav2017-08-1526-624/+1150
| | |_|/ | |/| |
* | | | Merge pull request #3121 from vespa-engine/hmusum/use-full-path-to-getvespaco...Arnstein Ressem2017-08-161-1/+1
|\ \ \ \
| * | | | Use vespa-get-configHarald Musum2017-08-161-1/+1
| * | | | Use full path to getvespaconfigHarald Musum2017-08-161-1/+1
* | | | | Merge pull request #3124 from vespa-engine/gjoranv/config-def-package-prepHarald Musum2017-08-162-113/+149
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Move namespace testing to separate class.gjoranv2017-08-162-116/+145
| * | | | Rename test to clarify intention.gjoranv2017-08-161-1/+1
| * | | | Split "number in namespace" tests to clarify intention.gjoranv2017-08-161-11/+18
| * | | | minor: remove 'require_that' prefix.gjoranv2017-08-161-3/+3
| * | | | minor: declare helpers private and update author.gjoranv2017-08-161-3/+3
| |/ / /
* | | | Merge pull request #3120 from vespa-engine/balder/produce-summary-features-if...Henning Baldersheim2017-08-1676-728/+291
|\ \ \ \ | |/ / / |/| | |
| * | | Do not overload based on only constness.Henning Baldersheim2017-08-162-4/+1
| * | | Cleanup intellij odd relayout.Henning Baldersheim2017-08-161-40/+37
| * | | Also propagate rank profile.Henning Baldersheim2017-08-161-2/+5
| * | | Also propagate rank profileHenning Baldersheim2017-08-163-9/+18
| * | | Use nested namespace and clean up some unused code.Henning Baldersheim2017-08-1623-132/+36