You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2016/07/04 09:34:15 UTC
[1/2] brooklyn-server git commit: Get rid of output from the
classpath generation from stdin and env
Repository: brooklyn-server
Updated Branches:
refs/heads/master 586795b32 -> 122c4eae8
Get rid of output from the classpath generation from stdin and env
i.e. the Executed ... result 0.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/11593c0d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/11593c0d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/11593c0d
Branch: refs/heads/master
Commit: 11593c0dcb52ace19f1fb826911014e9d1645217
Parents: a941963
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Jun 29 19:54:22 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Jun 29 19:54:22 2016 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/11593c0d/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java
index 5aa996c..26aed9c 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java
@@ -101,8 +101,8 @@ public class VanillaJavaAppSshDriver extends JavaSoftwareProcessSshDriver implem
ScriptHelper helper = newScript(CUSTOMIZING+"-classpath")
.body.append(String.format("ls -1 \"%s\"", Os.mergePaths(getRunDir(), "lib")))
+ .noExtraOutput()
.gatherOutput();
- helper.setFlag(SshTool.PROP_NO_EXTRA_OUTPUT, true);
int result = helper.execute();
if (result != 0) {
throw new IllegalStateException("Error listing classpath files: " + helper.getResultStderr());
[2/2] brooklyn-server git commit: This closes #224
Posted by gr...@apache.org.
This closes #224
* github/pr/224:
Get rid of output from the classpath generation from stdin and env
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/122c4eae
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/122c4eae
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/122c4eae
Branch: refs/heads/master
Commit: 122c4eae83d5c1d9705ff1a163f40110b3a692a0
Parents: 586795b 11593c0
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Mon Jul 4 10:34:11 2016 +0100
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Mon Jul 4 10:34:11 2016 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------