diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-20 12:48:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-20 12:48:00 +0100 |
| commit | eaa0ca37debf20f02211aa7b0c11cba310f27ce4 (patch) | |
| tree | 045c7746f497774c59ed4288c188b3137d382580 /config-model | |
| parent | e63125de6aa00bd671fc7c9b010dec786aacc64a (diff) | |
| parent | be081d5ac3bb14ed7673d6b37413cab6bf767ed0 (diff) | |
Merge pull request #20586 from vespa-engine/balder/xerces-2.12.1
Bump xerces from 2.12.0(2018) to 2.12.1(2021)
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index 9ab684c3f9d..628cf6bb4c7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -240,7 +240,7 @@ public class ContentCluster extends AbstractConfigProducer<AbstractConfigProduce } } - /** Returns whether this hosts one of the given container clusters */ + /** Returns of memory reserved on a host. Memory is reserved for the jvm if th ecluster is combined */ private double fractionOfMemoryReserved(String clusterId, Collection<ContainerModel> containers) { for (ContainerModel containerModel : containers) { Optional<String> hostClusterId = containerModel.getCluster().getHostClusterId(); |