diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-02-26 16:32:06 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-02-26 16:32:06 +0100 |
commit | 5168d102ca8c5d82c6f93753acc01cd2668d46a5 (patch) | |
tree | 8bef310c37d1508c5faecba3b4cf81d5d986e748 /defaults/src/main | |
parent | 2aa1ee8401290bfce3b97409e8fc634b8386f247 (diff) |
Revert "Merge pull request #12351 from vespa-engine/revert-11875-bratseth/node-metrics"
This reverts commit 37f6c5b31cb2809a54c34dc3a4e51307f3320fbd, reversing
changes made to 76221d0b9b7bda577ac61ce8a79c7b6ee3a8dbb4.
Diffstat (limited to 'defaults/src/main')
-rw-r--r-- | defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java index 6fb6e4f0860..0565b1cff09 100644 --- a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java +++ b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java @@ -39,6 +39,7 @@ public class Defaults { vespaPortConfigServerHttp = vespaPortConfigServerRpc + 1; vespaPortConfigProxyRpc = findConfigProxyPort(vespaPortBase + 90); } + static private String findVespaHome(String defHome) { Optional<String> vespaHomeEnv = Optional.ofNullable(System.getenv("VESPA_HOME")); if ( ! vespaHomeEnv.isPresent() || vespaHomeEnv.get().trim().isEmpty()) { |