X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Futil%2FConfig.java;h=c7e293393d6278c3f534d988286e98eadf04cc89;hb=67f21ba986462faaa66c606709463fff6c29c116;hp=6ad2b4fd95eb8544515d790b7df01cdc2240bee4;hpb=150440e220726db748f37428503e57b0996189a3;p=jalview.git diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java index 6ad2b4f..c7e2933 100644 --- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java +++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java @@ -471,7 +471,7 @@ public class Config private final Map _data; - public static final List allowedReplaceKeys = Arrays.asList("appbase","apparg","jvmarg"); // these are the ones we might use + public static final List allowedReplaceKeys = Arrays.asList("appbase","apparg","jvmarg","jvmmempc","jvmmemmax"); // these are the ones we might use public static final List allowedMergeKeys = Arrays.asList("apparg","jvmarg"); // these are the ones we might use //private final List allowedMergeKeys = Arrays.asList("apparg","jvmarg","resource","code","java_location"); // (not exhaustive list here) }