aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #8657 from vespa-engine/gjoranv/use-container-service-typegjoranv2019-03-0418-28/+81
|\ \ \ \ \ \ | | | | | | | | | | | | | | Gjoranv/use container service type
| * | | | | | Use ContainerServiceType in configserver.gjoranv2019-03-0111-19/+36
| | | | | | |
| * | | | | | Add unit test to ensure names don't change.gjoranv2019-03-011-0/+31
| | | | | | |
| * | | | | | Rename name field to avoid confusion with Enum's 'name()'gjoranv2019-03-012-4/+4
| | | | | | |
| * | | | | | Move ContainerServiceType to config-model-apigjoranv2019-03-016-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | .. to make it accessible without depending on config-model.
* | | | | | | Merge pull request #8663 from ↵Jon Bratseth2019-03-041-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8661-bjorncs/tls-insecure-mixed-mode Revert "Change default to 'tls_client_mixed_server'"
| * | | | | | Revert "Change default to 'tls_client_mixed_server'"Harald Musum2019-03-041-1/+1
|/ / / / / /
* | | | | | Merge pull request #8661 from vespa-engine/bjorncs/tls-insecure-mixed-modeBjørn Christian Seime2019-03-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change default to 'tls_client_mixed_server'
| * | | | | | Change default to 'tls_client_mixed_server'Bjørn Christian Seime2019-03-041-1/+1
|/ / / / / /
* | | | | | Merge pull request #8660 from vespa-engine/geirst/dont-use-gmock-for-nowJon Bratseth2019-03-042-5/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't use gmock for now as it triggers valgrind.
| * | | | | | Don't use gmock for now as it triggers valgrind.Geir Storli2019-03-042-5/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #8553 from vespa-engine/lesters/track-relevance-metricsLester Solbakken2019-03-042-2/+76
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add relevance @k metric tracking
| * | | | | Change to tracking relevance @ 3 instead of 5Lester Solbakken2019-03-042-12/+12
| | | | | |
| * | | | | Use constant string for relevance metricLester Solbakken2019-02-251-11/+13
| | | | | |
| * | | | | Add relevance metrics to default setLester Solbakken2019-02-251-0/+7
| | | | | |
| * | | | | Refactoring of relevance metric trackingLester Solbakken2019-02-251-24/+22
| | | | | |
| * | | | | Remove unnecessary importLester Solbakken2019-02-201-1/+0
| | | | | |
| * | | | | Pass execution and query to getRelevanceMetricContext insteadLester Solbakken2019-02-201-7/+8
| | | | | |
| * | | | | Add relevance @k metric trackingLester Solbakken2019-02-191-2/+69
| | | | | |
* | | | | | Merge pull request #8653 from ↵Geir Storli2019-03-0422-226/+101
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/geirst/migrate-tests-from-cppunit-to-gtest-1 Geirst/migrate tests from cppunit to gtest 1
| * | | | | | Fix indentation.Geir Storli2019-03-041-4/+4
| | | | | | |
| * | | | | | Migrate unit test from cppunit to gtest.Geir Storli2019-03-013-74/+32
| | | | | | |
| * | | | | | Migrate unit test from cppunit to gtest.Geir Storli2019-03-012-94/+33
| | | | | | |
| * | | | | | Add '()' to macro definition.Geir Storli2019-03-0111-11/+11
| | | | | | |
| * | | | | | Simplify.Geir Storli2019-03-016-6/+0
| | | | | | |
| * | | | | | Rewrite only cppunit test in documentapi to use gtest.Geir Storli2019-03-013-42/+26
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #8659 from ↵Jon Marius Venstad2019-03-021-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/intermediary-fix-for-empty-zk-nodes Treat empty nodes as non-existent
| * | | | | | Treat empty nodes as non-existentJon Marius Venstad2019-03-021-1/+3
|/ / / / / /
* | | | | | Merge pull request #8654 from ↵Jon Marius Venstad2019-03-0131-374/+293
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8651-revert-8650-revert-8645-jvenstad/fix-config-model-inconsitency Revert "Revert "Revert "Jvenstad/fix config model inconsitency"""
| * | | | | | Revert "Revert "Revert "Jvenstad/fix config model inconsitency"""Jon Marius Venstad2019-03-0131-374/+293
| | | | | | |
* | | | | | | Merge pull request #8658 from ↵Jon Marius Venstad2019-03-011-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8655-jvenstad/fix-config-model-inconsitency Revert "Create apps when prepare changes owner of sessions"
| * | | | | | | Revert "Create apps when prepare changes owner of sessions"Jon Marius Venstad2019-03-011-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #8655 from ↵Jon Marius Venstad2019-03-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/fix-config-model-inconsitency Create apps when prepare changes owner of sessions
| * | | | | | Create apps when prepare changes owner of sessionsJon Marius Venstad2019-03-011-0/+1
|/ / / / / /
* | | | | | Merge pull request #8651 from ↵Jon Marius Venstad2019-03-0131-293/+374
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | vespa-engine/revert-8650-revert-8645-jvenstad/fix-config-model-inconsitency Revert "Revert "Jvenstad/fix config model inconsitency""
| * | | | | Revert "Revert "Jvenstad/fix config model inconsitency""Jon Marius Venstad2019-03-0131-293/+374
|/ / / / /
* | | | | Merge pull request #8650 from ↵Jon Marius Venstad2019-03-0131-374/+293
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8645-jvenstad/fix-config-model-inconsitency Revert "Jvenstad/fix config model inconsitency"
| * | | | | Revert "Jvenstad/fix config model inconsitency"Harald Musum2019-03-0131-374/+293
|/ / / / /
* | | | | Merge pull request #8645 from ↵Jon Marius Venstad2019-03-0131-293/+374
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/fix-config-model-inconsitency Jvenstad/fix config model inconsitency
| * | | | | Avoid exception in getDeployTimeJon Marius Venstad2019-03-012-3/+6
| | | | | |
| * | | | | Avoid holding NR app lock during periodic redeploymentJon Marius Venstad2019-03-011-9/+9
| | | | | |
| * | | | | Create applications only during deployment, and abort activation of ↵Jon Marius Venstad2019-03-013-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | non-existing apps
| * | | | | Clean up method with only private usage or dummy implementationJon Marius Venstad2019-03-012-8/+1
| | | | | |
| * | | | | Synchronise access to session status of an application, and eliminate some racesJon Marius Venstad2019-03-019-79/+140
| | | | | |
| * | | | | Synchronise accesses to applicationSet in RemoteSession to avoid concurrent ↵Jon Marius Venstad2019-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | loading
| * | | | | Actually test the waiter in its test class >_<Jon Marius Venstad2019-03-011-0/+1
| | | | | |
| * | | | | Let TenantRequestHandler own a TenantApplicationsJon Marius Venstad2019-02-283-9/+17
| | | | | |
| * | | | | Optimise importsJon Marius Venstad2019-02-283-33/+48
| | | | | |
| * | | | | Various cleanup, non-functionalJon Marius Venstad2019-02-289-31/+13
| | | | | |
| * | | | | Register applications in TenantApplications before activating their sessionsJon Marius Venstad2019-02-289-29/+44
| | | | | |