Repository: brooklyn-server Updated Branches: refs/heads/master 213a4b332 -> ff5ba379e
Update config keys' deprecated names Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c1cf4950 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c1cf4950 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c1cf4950 Branch: refs/heads/master Commit: c1cf4950f865766a86e9a0789f1d0e7aa9352403 Parents: e2c0247 Author: Thomas Bouron <[email protected]> Authored: Mon Oct 2 17:26:31 2017 +0200 Committer: Thomas Bouron <[email protected]> Committed: Mon Oct 2 17:29:25 2017 +0200 ---------------------------------------------------------------------- .../camp/brooklyn/catalog/SpecParameterUnwrappingTest.java | 2 +- .../java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c1cf4950/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java index e5a69c7..400dba1 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java @@ -62,7 +62,7 @@ import com.google.common.collect.Iterables; public class SpecParameterUnwrappingTest extends AbstractYamlTest { // Expect app to have the following config keys already: - // "application.stop.shouldDestroy", "defaultDisplayName", "quorum.running", "quorum.up", "start.latch" + // "application.stop.shouldDestroy", "defaultDisplayName", "quorum.running", "quorum.up", "latch.start" public static final int NUM_APP_DEFAULT_CONFIG_KEYS = 5; // "defaultDisplayName" public static final int NUM_ENTITY_DEFAULT_CONFIG_KEYS = 1; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c1cf4950/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java b/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java index 10c5f3e..ab7013b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java @@ -227,7 +227,7 @@ public class BrooklynConfigKeys { .description("Latch for blocking files being copied before the pre-install; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')") .build(); public static final ConfigKey<Boolean> INSTALL_RESOURCES_LATCH = ConfigKeys.builder(Boolean.class) - .name("latch.install.reources") + .name("latch.install.resources") .deprecatedNames("resources.install.latch") .description("Latch for blocking files being copied before the install; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')") .build();
