You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by m4...@apache.org on 2017/04/13 13:58:12 UTC
[1/2] brooklyn-library git commit: Fix node.js requirements
Repository: brooklyn-library
Updated Branches:
refs/heads/master 9da131717 -> 8095d26a2
Fix node.js requirements
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/662316a5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/662316a5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/662316a5
Branch: refs/heads/master
Commit: 662316a5a5dfe2825d09cc907184f1a284e843e6
Parents: 9da1317
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Thu Apr 13 14:47:08 2017 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Thu Apr 13 14:47:08 2017 +0100
----------------------------------------------------------------------
.../brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/662316a5/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
index 4963038..20c79ae 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
@@ -103,7 +103,7 @@ public class NodeJsWebAppSshDriver extends AbstractSoftwareProcessSshDriver impl
.add(BashCommands.ifExecutableElse0("apt-get", BashCommands.chain(
BashCommands.installPackage("software-properties-common python-software-properties python g++ make"),
BashCommands.sudo("add-apt-repository ppa:chris-lea/node.js"))))
- .add(BashCommands.installPackage(MutableMap.of("yum", "git nodejs npm", "apt", "git-core nodejs"), null))
+ .add(BashCommands.installPackage(MutableMap.of("yum", "git nodejs npm", "apt", "git-core nodejs npm"), null))
.add("mkdir -p \"$HOME/.npm\"")
.add(BashCommands.sudo("npm install -g n"))
.add(BashCommands.sudo("n " + getVersion()))
[2/2] brooklyn-library git commit: This closes #98
Posted by m4...@apache.org.
This closes #98
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/8095d26a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/8095d26a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/8095d26a
Branch: refs/heads/master
Commit: 8095d26a2c6e350a08ae4f9d104189ef25fe4000
Parents: 9da1317 662316a
Author: Mark McKenna <m4...@gmail.com>
Authored: Thu Apr 13 14:57:34 2017 +0100
Committer: Mark McKenna <m4...@gmail.com>
Committed: Thu Apr 13 14:57:34 2017 +0100
----------------------------------------------------------------------
.../brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------