diff options
| author | Håvard Pettersen <havardpe@oath.com> | 2020-10-02 13:11:53 +0000 |
|---|---|---|
| committer | Håvard Pettersen <havardpe@oath.com> | 2020-10-02 13:11:53 +0000 |
| commit | 8c8c529e6fea1d0e8869dfb74881ca15ca9a89a9 (patch) | |
| tree | e84e06c8d3ac29cc829511bbf3dc93576d4596df /eval/CMakeLists.txt | |
| parent | 625e97105d691c417de78826c3f947926215147e (diff) | |
| parent | c67283d48af378f25cf1bd3ed8e578d0e529813f (diff) | |
Merge branch 'master' into havardpe/generic-reduce
fixed Conflicts:
eval/CMakeLists.txt
eval/src/vespa/eval/instruction/CMakeLists.txt
Diffstat (limited to 'eval/CMakeLists.txt')
| -rw-r--r-- | eval/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/eval/CMakeLists.txt b/eval/CMakeLists.txt index 2c6a05c7391..b8cc77b8290 100644 --- a/eval/CMakeLists.txt +++ b/eval/CMakeLists.txt @@ -35,6 +35,7 @@ vespa_define_module( src/tests/gp/ponder_nov2017 src/tests/instruction/generic_join src/tests/instruction/generic_reduce + src/tests/instruction/generic_merge src/tests/instruction/generic_rename src/tests/tensor/default_value_builder_factory src/tests/tensor/dense_add_dimension_optimizer |