aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Nonfunctional changes onlyJon Bratseth2017-10-2736-83/+101
* Merge pull request #3923 from vespa-engine/havardpe/more-diverse-type-knowled...Arne H Juul2017-10-273-23/+37
|\
| * test both typed and untyped evaluationHåvard Pettersen2017-10-271-10/+18
| * test interpret speed for untyped simple and typed defaultHåvard Pettersen2017-10-271-10/+11
| * also test with resolved typesHåvard Pettersen2017-10-271-3/+8
* | Merge pull request #3897 from vespa-engine/balder/make-testindependent-of-vm....Geir Storli2017-10-271-53/+38
|\ \
| * | Reanble test after making independent of vm.legacy_va_layoutHenning Baldersheim2017-10-261-53/+38
* | | Merge pull request #3917 from vespa-engine/hakonhall/add-rest-api-to-query-sl...Bjørn Christian Seime2017-10-273-11/+112
|\ \ \
| * | | Add REST API to query SlobrokHåkon Hallingstad2017-10-273-11/+112
* | | | Merge pull request #3913 from vespa-engine/hakonhall/add-service-status-metricsBjørn Christian Seime2017-10-277-12/+83
|\ \ \ \
| * | | | Add metric of whether any services are down, and fix numberOfServices metricHåkon Hallingstad2017-10-271-5/+10
| * | | | Fix generics warningsHåkon Hallingstad2017-10-271-2/+2
| * | | | Add service status metricsHåkon Hallingstad2017-10-267-12/+78
* | | | | Merge pull request #3918 from vespa-engine/bratseth/add-copyright-headersJon Marius Venstad2017-10-2780-12/+92
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add copyright headerJon Bratseth2017-10-2780-13/+93
* | | | | Merge pull request #3920 from vespa-engine/toregge/use-standard-locksHenning Baldersheim2017-10-2737-743/+590
|\ \ \ \ \
| * | | | | Use std::mutex instead of FastOS_Mutex.Tor Egge2017-10-271-15/+15
| * | | | | Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-8/+10
| * | | | | Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-45/+46
| * | | | | Reduce use of FastOS_Mutex and FastOS_Cond.Tor Egge2017-10-278-286/+158
| * | | | | Mutex instrumentation is long gone.Tor Egge2017-10-277-8/+8
| * | | | | Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-271-8/+12
| * | | | | Remove unneeded include statements.Tor Egge2017-10-272-2/+0
| * | | | | Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-22/+20
| * | | | | Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-10/+10
| * | | | | Use std::unique_lock<std::mutex> to guard node manager.Tor Egge2017-10-272-66/+50
| * | | | | Use std::unique_lock<std::mutex> to guard fnet search.Tor Egge2017-10-272-76/+85
| * | | | | Use std::unique_lock<std::mutex> to guard engine.Tor Egge2017-10-274-31/+30
| * | | | | Use std::atomic<int> instead of a mutex protected int to protect againstTor Egge2017-10-272-21/+6
| * | | | | Use std::unique_lock<std::mutex> to guard data set.Tor Egge2017-10-2711-145/+140
* | | | | | Merge pull request #3921 from vespa-engine/havardpe/clean-up-operation-classesArne H Juul2017-10-2716-476/+178
|\ \ \ \ \ \
| * | | | | | remove no longer needed operation abstractionsHåvard Pettersen2017-10-2716-476/+178
| |/ / / / /
* | | | | | Merge pull request #3916 from vespa-engine/hakonhall/remove-unused-gethostres...Bjørn Christian Seime2017-10-271-8/+0
|\ \ \ \ \ \
| * | | | | | Remove unused GetHostResponse constructorHåkon Hallingstad2017-10-271-8/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3914 from vespa-engine/mortent/simplify-identitygjoranv2017-10-275-21/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Simplify identity configurationMorten Tokle2017-10-275-21/+11
| |/ / / /
* | | | | Merge pull request #3904 from vespa-engine/havardpe/tensor-cleanupHåvard Pettersen2017-10-2718-293/+208
|\ \ \ \ \
| * | | | | normalize to fewer operation primitivesHåvard Pettersen2017-10-262-108/+124
| * | | | | add whitespaceHåvard Pettersen2017-10-261-15/+15
| * | | | | remove TensorSum (use more generic TensorReduce instead)Håvard Pettersen2017-10-2617-156/+36
| * | | | | test both reference and production tensor enginesHåvard Pettersen2017-10-261-16/+31
| * | | | | it is not allowed to reduce over a non-existing dimensionHåvard Pettersen2017-10-261-3/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3873 from vespa-engine/jvenstad/expose-property-info-in-a...Jon Marius Venstad2017-10-2731-920/+828
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Included property info with tenant repliesJon Marius Venstad2017-10-276-48/+52
| * | | | Updated test fiel tooJon Marius Venstad2017-10-261-3/+3
| * | | | toString -> displayNameJon Marius Venstad2017-10-261-1/+1
| * | | | Comments taken into accountJon Marius Venstad2017-10-2611-31/+55
| * | | | Oops, forgot test responseJon Marius Venstad2017-10-251-0/+13
| * | | | Add missing copyright headersJon Marius Venstad2017-10-252-0/+2
| * | | | Merge branch 'master' into jvenstad/expose-property-info-in-application-apiJon Marius Venstad2017-10-2512-37/+300
| |\ \ \ \