summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-08-30 13:32:42 +0200
committerJon Bratseth <bratseth@oath.com>2018-08-30 13:32:42 +0200
commit0a27a199c01ab1ac2d869b8bf6534e0d69eaefc5 (patch)
treecc23581788705da28df99e138e51497ac0742961
parent602b7f0d4d72b8f31154a69e1488b535486b36ad (diff)
Add bundle
-rwxr-xr-xconfig-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java2
-rw-r--r--simplemetrics/src/main/java/com/yahoo/metrics/simple/runtime/MetricProperties.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 4c5dafb7d8f..e69a28d9ec5 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -1,6 +1,7 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.model.container;
+import ai.vespa.models.evaluation.ModelsEvaluator;
import com.yahoo.cloud.config.ClusterInfoConfig;
import com.yahoo.cloud.config.ConfigserverConfig;
import com.yahoo.cloud.config.RoutingProviderConfig;
@@ -243,6 +244,7 @@ public final class ContainerCluster
// TODO better modelling
addSimpleComponent(ThreadPoolProvider.class);
addSimpleComponent(com.yahoo.concurrent.classlock.ClassLocking.class);
+ addSimpleComponent(ModelsEvaluator.class.getName(), null, "model-evaluation");
addSimpleComponent("com.yahoo.jdisc.http.filter.SecurityFilterInvoker");
addSimpleComponent(SIMPLE_LINGUISTICS_PROVIDER);
addSimpleComponent("com.yahoo.container.jdisc.SecretStoreProvider");
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/runtime/MetricProperties.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/runtime/MetricProperties.java
index 4bc9810667a..9c3ecec10fc 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/runtime/MetricProperties.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/runtime/MetricProperties.java
@@ -8,11 +8,13 @@ import java.nio.file.Paths;
* Constants used by Vespa to make the simple metrics implementation available
* to other components.
*
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public final class MetricProperties {
+
private MetricProperties() {
}
public static final String BUNDLE_SYMBOLIC_NAME = "simplemetrics";
+
}