Repository: incubator-brooklyn Updated Branches: refs/heads/master e92dd1ef4 -> 5c9153e85
Documentation updates Various documentation updates Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/31557666 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/31557666 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/31557666 Branch: refs/heads/master Commit: 315576669bfa9f239174b4eb39ca8b4a494ab2e5 Parents: e92dd1e Author: Graeme-Miller <[email protected]> Authored: Thu Sep 10 13:47:31 2015 +0100 Committer: Graeme-Miller <[email protected]> Committed: Thu Sep 10 13:47:31 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java | 2 +- docs/guide/yaml/multiple-services.md | 2 +- .../org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/31557666/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java index 49e7ee1..8716aa5 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java @@ -163,7 +163,7 @@ public class PdpProcessor { return; } } - throw new IllegalArgumentException("Deployment plan item "+deploymentPlanItem+" cannot be matched"); + throw new IllegalArgumentException("Deployment plan item cannot be matched. Please check your YAML. Item: "+deploymentPlanItem); } // ---------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/31557666/docs/guide/yaml/multiple-services.md ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/multiple-services.md b/docs/guide/yaml/multiple-services.md index 0f443dd..81ddf07 100644 --- a/docs/guide/yaml/multiple-services.md +++ b/docs/guide/yaml/multiple-services.md @@ -59,7 +59,7 @@ All quote characters must be plain ASCII, not fancy left-double-quotes and right There are as many ways to do dependency injection as there are developers, it sometimes seems; our aim in Brooklyn is not to say this has to be done one way, -but to support the various mechanisms people might need to do, for whatever reasons. +but to support the various mechanisms people might need, for whatever reasons. (We each have our opinions about what works well, of course; the one thing we do want to call out is that being able to dynamically update the injection is useful in a modern agile application -- so we are definitively **not** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/31557666/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java index d297828..b596a52 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java @@ -266,17 +266,20 @@ public class AutoScalerPolicy extends AbstractPolicy { @SetFromFlag("entityWithMetric") public static final ConfigKey<Entity> ENTITY_WITH_METRIC = BasicConfigKey.builder(Entity.class) .name("autoscaler.entityWithMetric") + .description("The Entity with the metric that will be monitored") .build(); @SetFromFlag("metricLowerBound") public static final ConfigKey<Number> METRIC_LOWER_BOUND = BasicConfigKey.builder(Number.class) .name("autoscaler.metricLowerBound") + .description("The lower bound of the monitored metric. Below this the policy will resize down") .reconfigurable(true) .build(); @SetFromFlag("metricUpperBound") public static final ConfigKey<Number> METRIC_UPPER_BOUND = BasicConfigKey.builder(Number.class) .name("autoscaler.metricUpperBound") + .description("The upper bound of the monitored metric. Above this the policy will resize up") .reconfigurable(true) .build();
