summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-05-05 07:47:45 +0200
committerJon Bratseth <bratseth@gmail.com>2022-05-05 07:47:45 +0200
commit700a5a68f095e999f85c8ca3fd34645612310019 (patch)
tree899c8bee096b5f0aa0fd448531917352e5a43a08 /config-model/src/main/java/com/yahoo
parent053bb05104feda086657aca2ac8932318ea4f3f4 (diff)
Revert "Merge pull request #22439 from vespa-engine/revert-22429-bratseth/schema-info-5-take-2"
This reverts commit 3726fd997c0cbacd37e64ff493f8775fc3fcdd9f, reversing changes made to d9ea4c99b13fa83a75bd8612d5f6c4d50510e3e9.
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java1
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index fae12a63427..bfa19cfe90c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -348,4 +348,5 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
this.containerCoreMemory = containerCoreMemory;
}
}
+
}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
index e26fb51bf98..708e7c75ac8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
@@ -56,6 +56,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
this.options = options;
owningCluster.addComponent(Component.fromClassAndBundle(QUERY_PROFILE_REGISTRY_CLASS, searchAndDocprocBundle));
+ owningCluster.addComponent(Component.fromClassAndBundle(com.yahoo.search.schema.SchemaInfo.class.getName(), searchAndDocprocBundle));
}
public void connectSearchClusters(Map<String, SearchCluster> searchClusters) {