summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #5948 from vespa-engine/gjoranv/maven35Arnstein Ressem2018-05-282-5/+5
|\ \ \ \ \ \
| * | | | | | Use maven 3.5 (per now gives 3.5.0)gjoranv2018-05-252-5/+5
* | | | | | | Merge pull request #5973 from vespa-engine/bratseth/parse-query-onlyHenning Baldersheim2018-05-284-20/+41
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Replace by parse query onlyJon Bratseth2018-05-284-20/+41
* | | | | | | Merge pull request #5971 from vespa-engine/lesters/export-onnxJon Bratseth2018-05-281-0/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Export ONNX packageLester Solbakken2018-05-281-0/+8
|/ / / / / /
* | | | | | Merge pull request #5969 from vespa-engine/bjorncs/identity-document-cleanupMorten Tokle2018-05-2811-412/+59
|\ \ \ \ \ \
| * | | | | | Remove deprecated identity-document entity typesBjørn Christian Seime2018-05-2811-412/+59
| |/ / / / /
* | | | | | Merge pull request #5965 from vespa-engine/ovirtanen/convert-scala-to-java-in...gjoranv2018-05-2817-605/+593
|\ \ \ \ \ \
| * | | | | | Stricter verification of exception in builder_cannot_be_reused using @Rule; v...Olli Virtanen2018-05-281-5/+11
| * | | | | | Clean up expected-to-fail test caseOlli Virtanen2018-05-281-7/+6
| * | | | | | Convert Scala code to Java, with ApplicationBuilderTest fixedOlli Virtanen2018-05-2517-605/+588
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5968 from vespa-engine/bratseth/avoid-deprecated-test-classJon Bratseth2018-05-281-17/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Don't use deprecated test utilityJon Bratseth2018-05-281-17/+14
|/ / / / /
* | | | | Merge pull request #5902 from vespa-engine/toregge/add-gtest-dependency-for-f...Arnstein Ressem2018-05-281-2/+12
|\ \ \ \ \
| * | | | | Add gtest dependencies for Fedora builds.Tor Egge2018-05-201-2/+12
* | | | | | Merge pull request #5966 from vespa-engine/lesters/onnx-feature-converterJon Bratseth2018-05-2813-55/+1221
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add copyright headersLester Solbakken2018-05-288-0/+14
| * | | | | Remove todoLester Solbakken2018-05-281-1/+1
| * | | | | Add ONNX pseudo ranking featureLester Solbakken2018-05-2810-54/+1206
|/ / / / /
* | | | | Merge pull request #5964 from vespa-engine/bratseth/better-error-messageLester Solbakken2018-05-287-21/+23
|\ \ \ \ \
| * | | | | Merge with masterJon Bratseth2018-05-281-1/+1
| * | | | | Merge branch 'master' into bratseth/better-error-messageJon Bratseth2018-05-2874-486/+703
| |\ \ \ \ \
| * | | | | | More explanation on type mismatchJon Bratseth2018-05-256-20/+22
* | | | | | | Merge pull request #5963 from vespa-engine/hmusum/do-not-delete-system-tenant...Harald Musum2018-05-282-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Don't delete hosted vespa tenantHarald Musum2018-05-282-0/+6
* | | | | | | | Merge pull request #5943 from vespa-engine/bratseth/json-validationJon Bratseth2018-05-2810-34/+219
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge with masterJon Bratseth2018-05-28180-1690/+2466
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #5946 from vespa-engine/balder/yql-same-elementJon Bratseth2018-05-285-160/+163
|\ \ \ \ \ \ \ \
| * | | | | | | | Add preliminary yql for sameElementHenning Baldersheim2018-05-255-160/+163
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #5962 from vespa-engine/revert-5959-balder/reapply-iterate...Henning Baldersheim2018-05-282-23/+27
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Revert "Remove the IndexCombinatorSearcher"Henning Baldersheim2018-05-282-23/+27
|/ / / / / / /
* | | | | | | Merge pull request #5961 from vespa-engine/hmusum/refactory-intervals-for-con...Valerij Fredriksen2018-05-281-8/+23
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Minor refactoring of how we set interval for maintainersHarald Musum2018-05-281-8/+23
* | | | | | | Merge pull request #5949 from vespa-engine/hakonhall/add-uncheck-to-yoleanHåkon Hallingstad2018-05-283-0/+99
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add uncheck to yoleanHåkon Hallingstad2018-05-253-0/+99
* | | | | | | Merge pull request #5959 from vespa-engine/balder/reapply-iterate-over-indexes-5Henning Baldersheim2018-05-282-27/+23
|\ \ \ \ \ \ \
| * | | | | | | Remove the IndexCombinatorSearcherHenning Baldersheim2018-05-272-27/+23
|/ / / / / / /
* | | | | | | Merge pull request #5958 from vespa-engine/balder/reapply-iterate-over-indexes-4Henning Baldersheim2018-05-272-64/+48
|\ \ \ \ \ \ \
| * | | | | | | Iterate over indexes for juniper searcher.Henning Baldersheim2018-05-272-64/+48
|/ / / / / / /
* | | | | | | Merge pull request #5957 from vespa-engine/toregge/use-fallthrough-attributesHenning Baldersheim2018-05-2715-56/+56
|\ \ \ \ \ \ \
| * | | | | | | Use fallthrough attributes.Tor Egge2018-05-2715-56/+56
* | | | | | | | Merge pull request #5953 from vespa-engine/toregge/handle-noncopyable-insert-...Henning Baldersheim2018-05-274-0/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle insertion of non-copyable keys and values in hash map.Tor Egge2018-05-274-0/+47
| |/ / / / / / /
* | | | | | | | Merge pull request #5955 from vespa-engine/toregge/add-more-valgrind-suppress...Henning Baldersheim2018-05-271-0/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Add more valgrind suppressions for vespa-cppunit on CentOS 7.Tor Egge2018-05-271-0/+32
| |/ / / / / / /
* | | | | | | | Merge pull request #5956 from vespa-engine/balder/reapply-iterate-over-indexes-3Henning Baldersheim2018-05-274-82/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | Iterate over indexes for ngram and quoting searcher.Henning Baldersheim2018-05-274-82/+61
|/ / / / / / / /
* | | | | | | | Merge pull request #5954 from vespa-engine/balder/reapply-iterate-over-indexes-2Henning Baldersheim2018-05-2717-31/+62
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Second part of iterate-over-indexesHenning Baldersheim2018-05-2717-31/+62
|/ / / / / / /