diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-04-22 12:50:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 12:50:54 +0200 |
| commit | fa3b0772979e07edd0bcd7bf8845794fe9d559e1 (patch) | |
| tree | 8d95e64823a9b548a98a26779f892f7542a17589 | |
| parent | a8d44f753b4d6e0a5e97dfe2e19684a6b8294705 (diff) | |
| parent | befc2526d3ab6cd078fa16352b894c79182d6a71 (diff) | |
Merge pull request #13009 from vespa-engine/bratseth/add-systeminfo-component
Add component
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 1 | ||||
| -rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 1 |
2 files changed, 1 insertions, 1 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 63e6af03c44..37548a15835 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 @@ -84,6 +84,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat addSimpleComponent("com.yahoo.container.jdisc.DeprecatedSecretStoreProvider"); addSimpleComponent("com.yahoo.container.jdisc.CertificateStoreProvider"); addSimpleComponent("com.yahoo.container.jdisc.AthenzIdentityProviderProvider"); + addSimpleComponent("ai.vespa.cloud.SystemInfo"); addMetricsV2Handler(); addTestrunnerComponentsIfTester(deployState); softStartSeconds = deployState.getProperties().defaultSoftStartSeconds(); 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 e2b1f97a6eb..833f6688fbc 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 @@ -170,7 +170,6 @@ public abstract class ContainerCluster<CONTAINER extends Container> addComponent(new StatisticsComponent()); addSimpleComponent(AccessLog.class); - // TODO: Better modelling addSimpleComponent(ThreadPoolProvider.class); addSimpleComponent(com.yahoo.concurrent.classlock.ClassLocking.class); addSimpleComponent(SecurityFilterInvoker.class); |