diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 09:40:38 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 09:40:38 +0100 |
| commit | 1545396dfa8a085bd6d03b4dd9412d788d230299 (patch) | |
| tree | a7cbbf82799a005437f27d38fc48062a2538f45c /config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | |
| parent | 8001f2c4cf42344178cc4ecb0c695ef701b2bbce (diff) | |
Revert "Merge pull request #15521 from vespa-engine/revert-15520-bratseth/apply-on-restart-take-4"
This reverts commit 9e228790db5222124dd6a125a9937584bd1d4a4b, reversing
changes made to a7cc1248bade10175a73a4602f8452ccda6a102a.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java')
| -rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 1 |
1 files changed, 1 insertions, 0 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 5593fba4ef2..8afffcbdce7 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 @@ -413,6 +413,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> @Override public void getConfig(ComponentsConfig.Builder builder) { + builder.setApplyOnRestart(getDeferChangesUntilRestart()); // Sufficient to set on one config builder.components.addAll(ComponentsConfigGenerator.generate(getAllComponents())); builder.components(new ComponentsConfig.Components.Builder().id("com.yahoo.container.core.config.HandlersConfigurerDi$RegistriesHack")); } |