summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove build rpath that is not needed.Geir Storli2017-08-171-1/+0
* Fix script to support relative input paths.Geir Storli2017-08-171-2/+2
* Add script to bootstrap cpp build.Geir Storli2017-08-172-15/+41
* 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
| * | | GC unused codeHenning Baldersheim2017-08-169-239/+19
| * | | Reduce includes.Henning Baldersheim2017-08-163-19/+9
| * | | Data, not stringHenning Baldersheim2017-08-152-2/+2
| * | | Send the sessionId down if present.Henning Baldersheim2017-08-151-3/+8
| * | | Add support for sessionid for using query cache.Henning Baldersheim2017-08-152-138/+126
| * | | Nested namespaceHenning Baldersheim2017-08-154-29/+22
| * | | Nested namespaceHenning Baldersheim2017-08-151-7/+3
| * | | Correct include orderHenning Baldersheim2017-08-159-65/+25
| * | | Use nested namespaceHenning Baldersheim2017-08-1529-109/+50
* | | | Merge pull request #3107 from vespa-engine/bjorncs/active-container-watchdogHenning Baldersheim2017-08-161-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Reduce number of false positivesBjørn Christian Seime2017-08-151-1/+2
| |/ /