diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-14 17:41:26 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-14 17:41:26 +0200 |
commit | e2c38221f0a93298e8f785d927c404607dc91854 (patch) | |
tree | ae83d46f269bbceec0c0f41b98929816e80233f1 | |
parent | 5bf819db9c2122959f6b06f7dbbbab4cdf53f97c (diff) |
Restart is on service level, not cluster level.
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 2 | ||||
-rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 2 |
2 files changed, 0 insertions, 4 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 0f90abc94bb..55f6a0b3825 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 @@ -18,7 +18,6 @@ import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import com.yahoo.vespa.defaults.Defaults; -import com.yahoo.vespa.model.application.validation.RestartConfigs; import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.ConfigProducerGroup; import com.yahoo.vespa.model.container.component.Servlet; @@ -41,7 +40,6 @@ import java.util.stream.Stream; * * @author gjoranv */ -@RestartConfigs({QrStartConfig.class}) public final class ApplicationContainerCluster extends ContainerCluster<ApplicationContainer> implements BundlesConfig.Producer, QrStartConfig.Producer, 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 e3e26cc39a9..a1aef1c0c91 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 @@ -37,7 +37,6 @@ import com.yahoo.vespa.configdefinition.IlscriptsConfig; import com.yahoo.vespa.model.PortsMeta; import com.yahoo.vespa.model.Service; import com.yahoo.vespa.model.admin.monitoring.Monitoring; -import com.yahoo.vespa.model.application.validation.RestartConfigs; import com.yahoo.vespa.model.clients.ContainerDocumentApi; import com.yahoo.vespa.model.container.component.AccessLogComponent; import com.yahoo.vespa.model.container.component.Component; @@ -79,7 +78,6 @@ import static com.yahoo.container.core.BundleLoaderProperties.DISK_BUNDLE_PREFIX * @author Einar M R Rosenvinge * @author Tony Vaagenes */ -@RestartConfigs({QrStartConfig.class}) public abstract class ContainerCluster<CONTAINER extends Container> extends AbstractConfigProducer<AbstractConfigProducer<?>> implements |