You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/04/22 14:28:52 UTC
[1/2] brooklyn-server git commit: Add Salt and Ansible features.
Repository: brooklyn-server
Updated Branches:
refs/heads/master 8cf7bbcc7 -> 8f2ccde00
Add Salt and Ansible 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/812e66ea
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/812e66ea
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/812e66ea
Branch: refs/heads/master
Commit: 812e66eaa24fd562e37256a040729fd9dae813a1
Parents: 8cf7bbc
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Fri Apr 22 09:50:10 2016 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Fri Apr 22 09:54:04 2016 +0100
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/812e66ea/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 c6075ec..9adc05e 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -283,6 +283,11 @@
<feature>brooklyn-software-base</feature>
</feature>
+ <feature name="brooklyn-software-cm" version="${project.version}" description="Configuration Management modules">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-software-cm-salt/${project.version}</bundle>
+ <bundle>mvn:org.apache.brooklyn/brooklyn-software-cm-ansible/${project.version}</bundle>
+ </feature>
+
<feature name="brooklyn-software-osgi" version="${project.version}" description="Brooklyn OSGi Software Entities">
<bundle>mvn:org.apache.brooklyn/brooklyn-software-osgi/${project.version}</bundle>
<feature>brooklyn-core</feature>
@@ -329,6 +334,7 @@
<feature name="brooklyn-osgi-launcher" version="${project.version}" description="Brooklyn init">
<feature>brooklyn-core</feature>
<feature>brooklyn-software-base</feature>
+ <feature>brooklyn-software-cm</feature>
<feature>brooklyn-locations-jclouds</feature>
<bundle>mvn:org.apache.brooklyn/brooklyn-launcher-common/${project.version}</bundle>
<bundle start-level="90">mvn:org.apache.brooklyn/brooklyn-karaf-init/${project.version}</bundle>
[2/2] brooklyn-server git commit: Closes #123
Posted by sv...@apache.org.
Closes #123
Add Salt and Ansible 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/8f2ccde0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8f2ccde0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8f2ccde0
Branch: refs/heads/master
Commit: 8f2ccde00389ea3686076d442e0a427196be06d7
Parents: 8cf7bbc 812e66e
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Apr 22 13:28:36 2016 +0100
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Apr 22 13:28:36 2016 +0100
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------