aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2022-02-22 13:55:28 +0100
committerGitHub <noreply@github.com>2022-02-22 13:55:28 +0100
commit530414f0d9a7ae94f5ad3ee0360826e3a11a0bee (patch)
tree54a852f4390e7215eb82f0774967c4721ddc9f4f /config-model/src
parenta24bef1a50610a08a420ce3bec9476bec3744022 (diff)
parent9a669c701c439f97fd1b1025010dbc10e91296cb (diff)
Merge pull request #21301 from vespa-engine/hmusum/dont-use-deprecated-allocated-memory
Move away from deprecated 'allocated-memory' attribute in nodes element
Diffstat (limited to 'config-model/src')
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 56633d52826..8db6d6001c9 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -85,7 +85,9 @@ public class ModelProvisioningTest {
" <handler id='myHandler'>" +
" <component id='injected' />" +
" </handler>" +
- " <nodes count='2' allocated-memory='45%' jvm-gc-options='-XX:+UseParNewGC' jvm-options='-verbosegc' preload='lib/blablamalloc.so'/>" +
+ " <nodes count='2' preload='lib/blablamalloc.so'>" +
+ " <jvm allocated-memory='45%' gc-options='-XX:+UseParNewGC' options='-verbosegc' />" +
+ " </nodes>" +
"</container>" +
"</services>";
String hosts ="<hosts>"