You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2017/05/31 09:58:29 UTC
[1/2] brooklyn-server git commit: Updated GCE features
Repository: brooklyn-server
Updated Branches:
refs/heads/master b3fa74c00 -> a81471d15
Updated GCE features
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c5ebcc42
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c5ebcc42
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c5ebcc42
Branch: refs/heads/master
Commit: c5ebcc424500cf5472df8a92b5c59633ba2ce79d
Parents: 947d5ae
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Tue May 30 17:36:52 2017 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Tue May 30 17:36:52 2017 +0100
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c5ebcc42/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 2befaac..de91681 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -267,8 +267,6 @@
<!--<bundle dependency="true">mvn:org.apache.jclouds.labs/abiquo/${jclouds.version}</bundle>--> <!-- jclouds abstraction not implemented -->
<bundle dependency="true">mvn:org.apache.jclouds.api/docker/${jclouds.version}</bundle>
- <bundle dependency="true">mvn:org.apache.jclouds.provider/google-compute-engine/${jclouds.version}</bundle>
- <bundle dependency="true">mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
<feature>jclouds-services</feature>
<bundle dependency="true">wrap:mvn:com.jcraft/jsch.agentproxy.sshj/0.0.9$Bundle-Name=wrap%20%3A%3A%20jsch.agentproxy.sshj</bundle>
@@ -310,6 +308,9 @@
<feature name="brooklyn-locations-jclouds-labs" version="${project.version}" description="Brooklyn JClouds Labs Location Targets">
<bundle>mvn:org.apache.jclouds.labs/azurecompute/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.labs/azurecompute-arm/${jclouds.version}</bundle>
+ <bundle>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle>
+ <bundle>mvn:org.apache.jclouds.common/googlecloud/${jclouds.version}</bundle>
+ <bundle>mvn:org.apache.jclouds.provider/google-compute-engine/${jclouds.version}</bundle>
</feature>
<feature name="brooklyn-test-framework" version="${project.version}" description="Brooklyn Test Framework" >
[2/2] brooklyn-server git commit: This closes #712
Posted by an...@apache.org.
This closes #712
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a81471d1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a81471d1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a81471d1
Branch: refs/heads/master
Commit: a81471d15c2c13a4aff86df8bd758e8e359ad31e
Parents: b3fa74c c5ebcc4
Author: Andrea Turli <an...@gmail.com>
Authored: Wed May 31 11:57:46 2017 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Wed May 31 11:57:46 2017 +0200
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------