diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-09-27 16:15:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-27 16:15:55 +0200 |
commit | ce658129949375955c9e7b522521cefe027ae283 (patch) | |
tree | ba033c87d26907b0a4b3f8d5415802408d7f96eb | |
parent | 2d004e2a84ff6851277733ed5183767f4b895b28 (diff) | |
parent | 6a9ab7511084986bac4401eb1dbb44c195d1816d (diff) |
Merge pull request #19310 from vespa-engine/revert-19309-revert-19303-bjorncs/cleanup
Revert "Revert "Use default value of jdisc.debug.resources.""
-rwxr-xr-x | configserver/src/main/sh/start-configserver | 1 | ||||
-rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 1 | ||||
-rwxr-xr-x | standalone-container/src/main/sh/standalone-container.sh | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index f9eb5e3a0a5..965dc8756be 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -188,7 +188,6 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \ -Djdisc.config.file=$cfpfile \ -Djdisc.export.packages= \ -Djdisc.cache.path=$bundlecachedir \ - -Djdisc.debug.resources=false \ -Djdisc.bundle.path=${VESPA_HOME}/lib/jars \ -Djdisc.logger.enabled=true \ -Djdisc.logger.level=ALL \ diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index f09a17de5e5..2d9bbcf21fc 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -212,7 +212,6 @@ exec $numactlcmd $envcmd java \ -Djdisc.config.file="$cfpfile" \ -Djdisc.export.packages=${jdisc_export_packages} \ -Djdisc.cache.path="$bundlecachedir" \ - -Djdisc.debug.resources=false \ -Djdisc.bundle.path="${VESPA_HOME}/lib/jars" \ -Djdisc.logger.enabled=false \ -Djdisc.logger.level=ALL \ diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index b30a7ad4cd0..e6cbb435b6f 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -180,7 +180,6 @@ StartCommand() { -Djdisc.config.file="$cfpfile" \ -Djdisc.export.packages= \ -Djdisc.cache.path="$bundlecachedir" \ - -Djdisc.debug.resources=false \ -Djdisc.bundle.path="$VESPA_HOME/lib/jars" \ -Djdisc.logger.enabled=true \ -Djdisc.logger.level=ALL \ |