aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2018-01-31 19:59:23 +0100
committerGitHub <noreply@github.com>2018-01-31 19:59:23 +0100
commit26acb3fa9e5acc00dc7b63f5bca079f46cd252c8 (patch)
treeb89714d279b0f0659842823523f38785d1c14fba
parent2b42b7abba86daa12dbc5691d1873bec14a94d00 (diff)
parent9532ad9aaa27789cf5ea1829f723376d1da04f00 (diff)
Merge pull request #4855 from vespa-engine/hakonhall/correctly-assign-stderr-to-stdout
Correctly assign stderr to stdout
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/Command.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/Command.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/Command.java
index 51acb1d2bca..275440f7840 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/Command.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/Command.java
@@ -52,7 +52,7 @@ public class Command {
".out"));
ProcessBuilder builder = new ProcessBuilder(arguments)
- .redirectError(ProcessBuilder.Redirect.appendTo(temporaryFile.toFile()))
+ .redirectErrorStream(true)
.redirectOutput(temporaryFile.toFile());
Process process = IOExceptionUtil.uncheck(builder::start);