Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #8657 from vespa-engine/gjoranv/use-container-service-type | gjoranv | 2019-03-04 | 18 | -28/+81 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Gjoranv/use container service type | |||||
| * | | | | | | Use ContainerServiceType in configserver. | gjoranv | 2019-03-01 | 11 | -19/+36 | |
| | | | | | | | ||||||
| * | | | | | | Add unit test to ensure names don't change. | gjoranv | 2019-03-01 | 1 | -0/+31 | |
| | | | | | | | ||||||
| * | | | | | | Rename name field to avoid confusion with Enum's 'name()' | gjoranv | 2019-03-01 | 2 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | Move ContainerServiceType to config-model-api | gjoranv | 2019-03-01 | 6 | -5/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. to make it accessible without depending on config-model. | |||||
* | | | | | | | Merge pull request #8663 from ↵ | Jon Bratseth | 2019-03-04 | 1 | -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 Musum | 2019-03-04 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #8661 from vespa-engine/bjorncs/tls-insecure-mixed-mode | Bjørn Christian Seime | 2019-03-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Change default to 'tls_client_mixed_server' | |||||
| * | | | | | | Change default to 'tls_client_mixed_server' | Bjørn Christian Seime | 2019-03-04 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #8660 from vespa-engine/geirst/dont-use-gmock-for-now | Jon Bratseth | 2019-03-04 | 2 | -5/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't use gmock for now as it triggers valgrind. | |||||
| * | | | | | | Don't use gmock for now as it triggers valgrind. | Geir Storli | 2019-03-04 | 2 | -5/+1 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #8553 from vespa-engine/lesters/track-relevance-metrics | Lester Solbakken | 2019-03-04 | 2 | -2/+76 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add relevance @k metric tracking | |||||
| * | | | | | Change to tracking relevance @ 3 instead of 5 | Lester Solbakken | 2019-03-04 | 2 | -12/+12 | |
| | | | | | | ||||||
| * | | | | | Use constant string for relevance metric | Lester Solbakken | 2019-02-25 | 1 | -11/+13 | |
| | | | | | | ||||||
| * | | | | | Add relevance metrics to default set | Lester Solbakken | 2019-02-25 | 1 | -0/+7 | |
| | | | | | | ||||||
| * | | | | | Refactoring of relevance metric tracking | Lester Solbakken | 2019-02-25 | 1 | -24/+22 | |
| | | | | | | ||||||
| * | | | | | Remove unnecessary import | Lester Solbakken | 2019-02-20 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | Pass execution and query to getRelevanceMetricContext instead | Lester Solbakken | 2019-02-20 | 1 | -7/+8 | |
| | | | | | | ||||||
| * | | | | | Add relevance @k metric tracking | Lester Solbakken | 2019-02-19 | 1 | -2/+69 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #8653 from ↵ | Geir Storli | 2019-03-04 | 22 | -226/+101 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/geirst/migrate-tests-from-cppunit-to-gtest-1 Geirst/migrate tests from cppunit to gtest 1 | |||||
| * | | | | | | Fix indentation. | Geir Storli | 2019-03-04 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | Migrate unit test from cppunit to gtest. | Geir Storli | 2019-03-01 | 3 | -74/+32 | |
| | | | | | | | ||||||
| * | | | | | | Migrate unit test from cppunit to gtest. | Geir Storli | 2019-03-01 | 2 | -94/+33 | |
| | | | | | | | ||||||
| * | | | | | | Add '()' to macro definition. | Geir Storli | 2019-03-01 | 11 | -11/+11 | |
| | | | | | | | ||||||
| * | | | | | | Simplify. | Geir Storli | 2019-03-01 | 6 | -6/+0 | |
| | | | | | | | ||||||
| * | | | | | | Rewrite only cppunit test in documentapi to use gtest. | Geir Storli | 2019-03-01 | 3 | -42/+26 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #8659 from ↵ | Jon Marius Venstad | 2019-03-02 | 1 | -1/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/intermediary-fix-for-empty-zk-nodes Treat empty nodes as non-existent | |||||
| * | | | | | | Treat empty nodes as non-existent | Jon Marius Venstad | 2019-03-02 | 1 | -1/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #8654 from ↵ | Jon Marius Venstad | 2019-03-01 | 31 | -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 Venstad | 2019-03-01 | 31 | -374/+293 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #8658 from ↵ | Jon Marius Venstad | 2019-03-01 | 1 | -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 Venstad | 2019-03-01 | 1 | -1/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #8655 from ↵ | Jon Marius Venstad | 2019-03-01 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/fix-config-model-inconsitency Create apps when prepare changes owner of sessions | |||||
| * | | | | | | Create apps when prepare changes owner of sessions | Jon Marius Venstad | 2019-03-01 | 1 | -0/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #8651 from ↵ | Jon Marius Venstad | 2019-03-01 | 31 | -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 Venstad | 2019-03-01 | 31 | -293/+374 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #8650 from ↵ | Jon Marius Venstad | 2019-03-01 | 31 | -374/+293 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8645-jvenstad/fix-config-model-inconsitency Revert "Jvenstad/fix config model inconsitency" | |||||
| * | | | | | Revert "Jvenstad/fix config model inconsitency" | Harald Musum | 2019-03-01 | 31 | -374/+293 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #8645 from ↵ | Jon Marius Venstad | 2019-03-01 | 31 | -293/+374 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/fix-config-model-inconsitency Jvenstad/fix config model inconsitency | |||||
| * | | | | | Avoid exception in getDeployTime | Jon Marius Venstad | 2019-03-01 | 2 | -3/+6 | |
| | | | | | | ||||||
| * | | | | | Avoid holding NR app lock during periodic redeployment | Jon Marius Venstad | 2019-03-01 | 1 | -9/+9 | |
| | | | | | | ||||||
| * | | | | | Create applications only during deployment, and abort activation of ↵ | Jon Marius Venstad | 2019-03-01 | 3 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | non-existing apps | |||||
| * | | | | | Clean up method with only private usage or dummy implementation | Jon Marius Venstad | 2019-03-01 | 2 | -8/+1 | |
| | | | | | | ||||||
| * | | | | | Synchronise access to session status of an application, and eliminate some races | Jon Marius Venstad | 2019-03-01 | 9 | -79/+140 | |
| | | | | | | ||||||
| * | | | | | Synchronise accesses to applicationSet in RemoteSession to avoid concurrent ↵ | Jon Marius Venstad | 2019-03-01 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | loading | |||||
| * | | | | | Actually test the waiter in its test class >_< | Jon Marius Venstad | 2019-03-01 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | Let TenantRequestHandler own a TenantApplications | Jon Marius Venstad | 2019-02-28 | 3 | -9/+17 | |
| | | | | | | ||||||
| * | | | | | Optimise imports | Jon Marius Venstad | 2019-02-28 | 3 | -33/+48 | |
| | | | | | | ||||||
| * | | | | | Various cleanup, non-functional | Jon Marius Venstad | 2019-02-28 | 9 | -31/+13 | |
| | | | | | | ||||||
| * | | | | | Register applications in TenantApplications before activating their sessions | Jon Marius Venstad | 2019-02-28 | 9 | -29/+44 | |
| | | | | | |