summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove malicious import-package from config-model-fat.gjoranv2017-09-071-1/+0
* Add comment explaining why jdisc_core depends on xml-apis.gjoranv2017-09-071-0/+1
* Merge pull request #3359 from vespa-engine/hmusum/add-debug-log-of-config-gen...Harald Musum2017-09-071-2/+5
|\
| * Avoid creating strings unless necessaryHarald Musum2017-09-071-2/+2
| * Add request to log lineHarald Musum2017-09-071-2/+2
| * Add debug log line for config generation for supermodel configsHarald Musum2017-09-071-1/+4
* | Merge pull request #3358 from vespa-engine/origin/gjoranv/exclude-scala-xml2Bjørn Christian Seime2017-09-075-0/+26
|\ \ | |/ |/|
| * Exclude scala-xml from provided classpathgjoranv2017-09-075-0/+26
|/
* Merge pull request #3357 from vespa-engine/revert-3354-musum/move-orchestrato...Harald Musum2017-09-073-8/+0
|\
| * Revert "Move orchestrator.def to configdefinititions/"Harald Musum2017-09-073-8/+0
|/
* Merge pull request #3356 from vespa-engine/mpolden/log-build-numberMartin Polden2017-09-078-7/+23
|\
| * Log build number when triggering from completionMartin Polden2017-09-078-7/+23
* | Merge pull request #3355 from vespa-engine/hmusum/use-more-specific-error-codeJon Bratseth2017-09-072-3/+3
|\ \
| * | Use a more specific error codeHarald Musum2017-09-072-3/+3
* | | Merge pull request #3353 from vespa-engine/geirst/add-bitvector-search-cache-...Geir Storli2017-09-0743-239/+666
|\ \ \ | |_|/ |/| |
| * | Make AttributeWriter::forceCommit() clear the search cache of all imported at...Geir Storli2017-09-069-25/+87
| * | Use bit vector search cache in imported search context if available.Geir Storli2017-09-0610-50/+180
| * | Instantiate bit vector search cache in imported attribute vectors if visibili...Geir Storli2017-09-0618-31/+101
| * | Rename IAttributeWriter::commit() -> forceCommit().Geir Storli2017-09-067-11/+10
| * | Implement simple bitvector search cache for use in imported attribute vector.Geir Storli2017-09-066-0/+166
| * | Fix indent.Geir Storli2017-09-061-146/+146
* | | Merge pull request #3333 from vespa-engine/freva/fix-storage-maintainerValerij Fredriksen2017-09-074-42/+54
|\ \ \ | |_|/ |/| |
| * | Use ten powers for disk sizeValerij Fredriksen2017-09-063-5/+5
| * | Use os.version instead of uname -rvalerijf2017-09-051-21/+1
| * | Do not fail on stderrvalerijf2017-09-051-6/+0
| * | Only call removeOldFiles if diskUtil > 0.8valerijf2017-09-052-5/+41
| * | Fix remove old logs pathsvalerijf2017-09-051-7/+9
* | | Merge pull request #3354 from vespa-engine/musum/move-orchestrator-config-def...Harald Musum2017-09-073-0/+8
|\ \ \ | |_|/ |/| |
| * | Move orchestrator.def to configdefinititions/Harald Musum2017-09-063-0/+8
* | | Merge pull request #3352 from vespa-engine/toregge/use-gid-to-lid-change-hand...Geir Storli2017-09-0620-138/+151
|\ \ \
| * | | Remove commented out method.Tor Egge2017-09-061-1/+0
| * | | Move API comments from implementation headers to interface header.Tor Egge2017-09-063-25/+11
| * | | Remove dead code.Tor Egge2017-09-062-57/+0
| * | | Correct lookupDocId method declaration.Tor Egge2017-09-061-1/+1
| * | | Use gid to lid change handler interface directly.Tor Egge2017-09-064-42/+7
| * | | Add dummy gid to lid change handler.Tor Egge2017-09-0616-29/+149
|/ / /
* | | Merge pull request #3351 from vespa-engine/revert-3334-toregge/use-gid-to-lid...Geir Storli2017-09-0625-250/+179
|\ \ \
| * | | Revert "Use gid to lid change handler interface directly"Tor Egge2017-09-0625-250/+179
* | | | Merge pull request #3340 from vespa-engine/hakon/add-preferred-orchestrator-lockhakonhall2017-09-064-55/+89
|\ \ \ \
| * | | | Add preferred Orchestrator lockHåkon Hallingstad2017-09-064-55/+89
* | | | | Merge pull request #3350 from vespa-engine/gjoranv/commons-lang-test3-scopeBjørn Christian Seime2017-09-062-6/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Set commons-lang3 to test scope, only used in a unit test.gjoranv2017-09-062-6/+1
| | |/ / | |/| |
* | | | Merge pull request #3349 from vespa-engine/andreer/remove-only-use-of-autovaluehakonhall2017-09-062-16/+41
|\ \ \ \ | |/ / / |/| | |
| * | | remove only use of autovalueAndreas Eriksen2017-09-062-16/+41
* | | | Merge pull request #3348 from vespa-engine/arnej/add-metrics-display-namegjoranv2017-09-065-6/+31
|\ \ \ \ | |/ / / |/| | |
| * | | unit test "display-name"Arne Juul2017-09-051-2/+13
| * | | escape japaneseArne Juul2017-09-051-1/+1
| * | | add "display-name" attribute for metricsArne Juul2017-09-053-3/+17
* | | | Merge pull request #3347 from vespa-engine/bjorncs/bootstrapLester Solbakken2017-09-061-0/+4
|\ \ \ \
| * | | | Add some user output to bootstrap scriptBjørn Christian Seime2017-09-061-0/+4
| | |/ / | |/| |