summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bratseth/remove-dead-codeJon Bratseth2018-09-1975-663/+1263
|\
| * Merge pull request #7017 from vespa-engine/geirst/migrate-legacy-proton-metri...Henning Baldersheim2018-09-199-41/+146
| |\
| | * Migrate metrics for session manager grouping cache and add metrics for search...Geir Storli2018-09-199-39/+140
| | * Migrate metric for number of documents in memory index.Geir Storli2018-09-193-2/+6
| * | Merge pull request #7020 from vespa-engine/jvenstad/better-compile-version-guessJon Bratseth2018-09-191-2/+2
| |\ \
| | * | Take a (good) guess at compile version for component jobsJon Marius Venstad2018-09-191-2/+2
| * | | Merge pull request #7002 from vespa-engine/balder/improve-invalid-text-detectionJon Bratseth2018-09-193-17/+58
| |\ \ \
| | * | | Update the test to reflect stricter text input validation.Henning Baldersheim2018-09-191-0/+9
| | * | | Ensure that you can not trick invalid characters past the text verification i...Henning Baldersheim2018-09-192-17/+49
| * | | | Use correct version for jackson-databind preinstall jar. (#7015)gjoranv2018-09-191-1/+1
| | |/ / | |/| |
| * | | Merge pull request #7011 from vespa-engine/gjoranv/jackson-databindgjoranv2018-09-192-3/+4
| |\ \ \
| | * | | Update jackson to 2.8.11 and jackson-databind to 2.8.11.2gjoranv2018-09-192-3/+4
| * | | | Merge pull request #7009 from vespa-engine/hakon/log-reason-for-removal-of-nodeHarald Musum2018-09-191-3/+11
| |\ \ \ \
| | * | | | Log reason for removal of nodeHåkon Hallingstad2018-09-191-3/+11
| * | | | | Merge pull request #7007 from vespa-engine/jvenstad/hostedJon Marius Venstad2018-09-1910-0/+430
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Address reviewJon Marius Venstad2018-09-191-21/+1
| | * | | | Add modules for open-source hosted applicationsJon Marius Venstad2018-09-1910-0/+450
| | | |/ / | | |/| |
| * | | | Warn on deprecated 'metric-consumers' in services.xml.gjoranv2018-09-191-0/+4
| | |_|/ | |/| |
| * | | Merge pull request #7003 from vespa-engine/olaaun/fix-pattern-orderHarald Musum2018-09-192-2/+26
| |\ \ \
| | * | | Fixed pattern order in getBindingMatch. Added testOla Aunrønning2018-09-192-2/+26
| | |/ /
| * | | Merge pull request #7005 from vespa-engine/balder/haunt-metastore-test-bugHenning Baldersheim2018-09-191-1/+1
| |\ \ \
| | * | | Must wait longer than stats update interval.Henning Baldersheim2018-09-191-1/+1
| | |/ /
| * | | Merge pull request #7001 from vespa-engine/hmusum/use-logserver-in-hostedHarald Musum2018-09-192-1/+8
| |\ \ \ | | |/ / | |/| |
| | * | Use logserver when it is running on its own node in hostedHarald Musum2018-09-192-1/+8
| * | | Merge pull request #7000 from vespa-engine/hmusum/check-config-generation-in-...Martin Polden2018-09-192-5/+5
| |\ \ \ | | |/ / | |/| |
| | * | Check service config generations in parallelHarald Musum2018-09-192-5/+5
| * | | Merge pull request #6967 from vespa-engine/ollivir/move-logic-to-fs4closeable...Henning Baldersheim2018-09-197-399/+432
| |\ \ \
| | * | | FS4 interfacing code moved to FS4CloseableChannel from FastSearcherOlli Virtanen2018-09-147-399/+432
| * | | | Merge pull request #6997 from vespa-engine/geirst/migrate-legacy-proton-execu...Henning Baldersheim2018-09-1912-36/+77
| |\ \ \ \
| | * | | | Migrate legacy proton executor metrics and add missing metrics.Geir Storli2018-09-183-11/+55
| | * | | | Rename proton summary executor -> shared executor.Geir Storli2018-09-188-22/+22
| | * | | | Remove unused code.Geir Storli2018-09-183-3/+0
| * | | | | Merge pull request #6977 from vespa-engine/gjoranv/remove-linguistics-bindingHenning Baldersheim2018-09-192-3/+17
| |\ \ \ \ \
| | * | | | | Create SimpleLinguistics singleton lazily.gjoranv2018-09-171-1/+2
| | * | | | | Add binding for Linguistics to HandlersConfigurerTestWrapper.gjoranv2018-09-171-2/+16
| | * | | | | Remove guice binding for Linguistics.gjoranv2018-09-171-1/+0
| * | | | | | Merge pull request #6989 from vespa-engine/gjoranv/remove-deprecated-unused-c...Henning Baldersheim2018-09-193-87/+0
| |\ \ \ \ \ \
| | * | | | | | Remove unused and deprecated classes in non-public package.gjoranv2018-09-183-87/+0
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #6984 from vespa-engine/balder/increase-interval-from-1s-t...Henning Baldersheim2018-09-1917-62/+33
| |\ \ \ \ \ \
| | * | | | | | Reduce frequency to avoid spending 1/2 core for when having many attributes.Henning Baldersheim2018-09-171-1/+1
| | * | | | | | GC unused code and add override and = default.Henning Baldersheim2018-09-1717-61/+32
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #6999 from vespa-engine/frodelu/update-usageJon Bratseth2018-09-181-0/+8
| |\ \ \ \ \ \
| | * | | | | | Added more options to usage outputFrode Lundgren2018-09-181-0/+8
| |/ / / / / /
* | | | | | | Rename classJon Bratseth2018-09-194-15/+10
* | | | | | | Remove dead codeJon Bratseth2018-09-1919-339/+33
|/ / / / / /
* | | | | | Merge pull request #6981 from vespa-engine/lesters/add-model-eval-rest-apiJon Bratseth2018-09-189-19/+431
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Change return codes from 400 to 404Jon Bratseth2018-09-182-10/+14
| * | | | | AddedJon Bratseth2018-09-181-0/+4
| * | | | | Wire in model evaluation rest api handlerLester Solbakken2018-09-172-1/+24
| * | | | | Add model evaluation rest api handlerLester Solbakken2018-09-176-18/+399