summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/resources/schema/common.rnc
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-11-02 14:23:17 +0100
committerGitHub <noreply@github.com>2018-11-02 14:23:17 +0100
commitd4572d3347aafa7061ed6104eb56ec5d63e7e9f8 (patch)
tree5e956639d7e34b696d023b43095555afa7e5f306 /config-model/src/main/resources/schema/common.rnc
parentd62eabd50a4c05684eca03f41eac6b20b0976950 (diff)
parent28a18330555aa76601cacc1ec4244e0360aa68d4 (diff)
Merge pull request #7551 from vespa-engine/balder/jvmargs-2-jvm-options
Add jvm-options and prefer over jvmargs
Diffstat (limited to 'config-model/src/main/resources/schema/common.rnc')
-rw-r--r--config-model/src/main/resources/schema/common.rnc1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-model/src/main/resources/schema/common.rnc b/config-model/src/main/resources/schema/common.rnc
index 32ba67b6429..73882da2b01 100644
--- a/config-model/src/main/resources/schema/common.rnc
+++ b/config-model/src/main/resources/schema/common.rnc
@@ -2,6 +2,7 @@
service.attlist &= attribute hostalias { xsd:NCName }
service.attlist &= attribute baseport { xsd:unsignedShort }?
service.attlist &= attribute jvmargs { text }?
+service.attlist &= attribute jvm-options { text }?
service.attlist &= attribute jvm-gc-options { text }?
# preload is for internal use only
service.attlist &= attribute preload { text }?