You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/04/14 02:05:50 UTC
[1/2] incubator-brooklyn git commit: tweak blueprint-tour order for
readability
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master bf07fe1f0 -> c7e20ceb5
tweak blueprint-tour order for readability
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3dde5f47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3dde5f47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3dde5f47
Branch: refs/heads/master
Commit: 3dde5f4748928a7b3c3fb01b759a7473a460adb4
Parents: bf07fe1
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Apr 13 17:19:18 2015 -0500
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Apr 13 17:19:18 2015 -0500
----------------------------------------------------------------------
docs/website/learnmore/blueprint-tour.md | 36 +++++++++++++--------------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3dde5f47/docs/website/learnmore/blueprint-tour.md
----------------------------------------------------------------------
diff --git a/docs/website/learnmore/blueprint-tour.md b/docs/website/learnmore/blueprint-tour.md
index e13fcd8..c31ac89 100644
--- a/docs/website/learnmore/blueprint-tour.md
+++ b/docs/website/learnmore/blueprint-tour.md
@@ -71,21 +71,6 @@ services:</div></div>
<div class="block">
<div class="annotations_wrapper1"><div class="annotations_wrapper2"><div class="annotations">
<div class="short">
- Configure locations
- </div>
- <div class="long"><p>
- Give generic VM properties or specific images and flavors.
- Networking topologies and geographic constraints are also supported.
- </p></div>
- </div><div class="connector"><div> </div></div></div></div>
-<div> provisioning.properties:
-<span class="ann_highlight"> osFamily: ubuntu
- minRam: 4gb</span>
-</div></div>
-
-<div class="block">
- <div class="annotations_wrapper1"><div class="annotations_wrapper2"><div class="annotations">
- <div class="short">
Inject dependencies
</div>
<div class="long"><p>
@@ -104,6 +89,21 @@ services:</div></div>
<div class="block">
<div class="annotations_wrapper1"><div class="annotations_wrapper2"><div class="annotations">
<div class="short">
+ Configure locations
+ </div>
+ <div class="long"><p>
+ Give generic VM properties or specific images and flavors.
+ Networking topologies and geographic constraints are also supported.
+ </p></div>
+ </div><div class="connector"><div> </div></div></div></div>
+<div> provisioning.properties:
+<span class="ann_highlight"> osFamily: ubuntu
+ minRam: 4gb</span>
+</div></div>
+
+<div class="block">
+ <div class="annotations_wrapper1"><div class="annotations_wrapper2"><div class="annotations">
+ <div class="short">
Extend using Java
</div>
<div class="long"><p>
@@ -119,7 +119,7 @@ services:</div></div>
<div>- type: <span class="ann_highlight">brooklyn.entity.webapp.ControlledDynamicWebAppCluster:1.1.0</span>
war: http://example.com/couchbase-chat/chatroom.war
java.sysprops:
- chat.db.url: $brooklyn:entity("couchbase").attributeWhenReady("couchbase.cluster.connection.url")</div></div>
+ chat.db.url: $brooklyn:entity("chat-couchbase").attributeWhenReady("couchbase.cluster.connection.url")</div></div>
<div class="block">
<div class="annotations_wrapper1"><div class="annotations_wrapper2"><div class="annotations">
@@ -133,9 +133,9 @@ services:</div></div>
</p></div>
</div><div class="connector"><div> </div></div></div></div>
<div> brooklyn.policies:
- - type: <span class="ann_highlight">brooklyn.policy.autoscaling.AutoScalerPolicy</span>
+ - type: <span class="ann_highlight">autoscaler</span>
brooklyn.config:
- metric: $brooklyn:sensor("brooklyn.entity.webapp.DynamicWebAppCluster", "webapp.reqs.perSec.windowed.perNode")
+ metric: $brooklyn:sensor(""webapp.reqs.perSec.windowed.perNode")
metricLowerBound: 400
metricUpperBound: 600</div></div>
[2/2] incubator-brooklyn git commit: strings.join does not throw NPE
Posted by he...@apache.org.
strings.join does not throw NPE
useful when using the joiner enricher if the inputted list is null
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c7e20ceb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c7e20ceb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c7e20ceb
Branch: refs/heads/master
Commit: c7e20ceb56c570f810b53e57241e5035b53b3fe1
Parents: 3dde5f4
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Apr 13 17:19:37 2015 -0500
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Apr 13 17:19:57 2015 -0500
----------------------------------------------------------------------
utils/common/src/main/java/brooklyn/util/text/Strings.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c7e20ceb/utils/common/src/main/java/brooklyn/util/text/Strings.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/text/Strings.java b/utils/common/src/main/java/brooklyn/util/text/Strings.java
index d874783..c619565 100644
--- a/utils/common/src/main/java/brooklyn/util/text/Strings.java
+++ b/utils/common/src/main/java/brooklyn/util/text/Strings.java
@@ -181,6 +181,7 @@ public class Strings {
/** convenience for {@link com.google.common.base.Joiner} */
public static String join(Iterable<? extends Object> list, String seperator) {
+ if (list==null) return null;
boolean app = false;
StringBuilder out = new StringBuilder();
for (Object s: list) {