You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/07/06 10:29:53 UTC
[1/2] brooklyn-server git commit: Fix policy catalog.bom (for running
in karaf)
Repository: brooklyn-server
Updated Branches:
refs/heads/master 79092da6a -> 1f2e2a1c4
Fix policy catalog.bom (for running in karaf)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/df3b90f8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/df3b90f8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/df3b90f8
Branch: refs/heads/master
Commit: df3b90f8801deb3914f6a19341f1518571039463
Parents: 79092da
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 6 11:27:53 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 6 11:27:53 2016 +0100
----------------------------------------------------------------------
policy/src/main/resources/catalog.bom | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/df3b90f8/policy/src/main/resources/catalog.bom
----------------------------------------------------------------------
diff --git a/policy/src/main/resources/catalog.bom b/policy/src/main/resources/catalog.bom
index ee966c9..ba35aa6 100644
--- a/policy/src/main/resources/catalog.bom
+++ b/policy/src/main/resources/catalog.bom
@@ -17,7 +17,6 @@
brooklyn.catalog:
version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
- itemType: policy
items:
- id: org.apache.brooklyn.policy.ha.ConnectionFailureDetector
itemType: policy
@@ -42,6 +41,7 @@ brooklyn.catalog:
# item:
# type: org.apache.brooklyn.policy.followthesun.FollowTheSunPool
- id: org.apache.brooklyn.policy.loadbalancing.BalanceableWorkerPool
+ itemType: entity
item:
type: org.apache.brooklyn.policy.loadbalancing.BalanceableWorkerPool
- id: org.apache.brooklyn.policy.ha.ServiceReplacer
@@ -51,6 +51,7 @@ brooklyn.catalog:
name: Service Replacer
description: HA policy for replacing a failed member of a group
- id: org.apache.brooklyn.policy.loadbalancing.ItemsInContainersGroup
+ itemType: entity
item:
type: org.apache.brooklyn.policy.loadbalancing.ItemsInContainersGroup
- id: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
[2/2] brooklyn-server git commit: This closes #232
Posted by al...@apache.org.
This closes #232
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1f2e2a1c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1f2e2a1c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1f2e2a1c
Branch: refs/heads/master
Commit: 1f2e2a1c49a32e707bfef30145c14e9c32b60d76
Parents: 79092da df3b90f
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 6 11:29:40 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 6 11:29:40 2016 +0100
----------------------------------------------------------------------
policy/src/main/resources/catalog.bom | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------