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 2017/02/15 18:31:12 UTC
[19/28] brooklyn-server git commit: newly deprecated items now refer
to 0.11.0 not 0.10.0
newly deprecated items now refer to 0.11.0 not 0.10.0
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d2e23c42
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d2e23c42
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d2e23c42
Branch: refs/heads/master
Commit: d2e23c4257ff2deb4a2360616c39226baa424c2d
Parents: bb95469
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Feb 13 16:12:49 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Feb 13 16:13:30 2017 +0000
----------------------------------------------------------------------
.../apache/brooklyn/core/config/BasicConfigInheritance.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d2e23c42/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigInheritance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigInheritance.java b/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigInheritance.java
index 4d66293..221263f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigInheritance.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigInheritance.java
@@ -184,7 +184,7 @@ public class BasicConfigInheritance implements ConfigInheritance {
* of {@link #resolveWithParentCustomStrategy(ConfigValueAtContainer, ConfigValueAtContainer, org.apache.brooklyn.config.ConfigInheritance.ConfigInheritanceContext)} */
@Nullable protected final String conflictResolutionStrategy;
- /** @deprecated since 0.10.0 when this was introduced, now renamed {@link #localDefaultResolvesWithAncestorValue} */
+ /** @deprecated since 0.11.0 when this was introduced, now renamed {@link #localDefaultResolvesWithAncestorValue} */
@Deprecated protected final Boolean useLocalDefaultValue;
/** whether a local default value should be considered for resolution in the presence of an ancestor value.
* can use true with {@link #CONFLICT_RESOLUTION_STRATEGY_OVERWRITE} to mean don't inherit,
@@ -215,7 +215,7 @@ public class BasicConfigInheritance implements ConfigInheritance {
* defines a local default value (with this field true) will have its conflict resolution strategy
* applied with the ancestor's default value.
* <p>
- * if this is false, ancestor defaults are completely ignored; prior to 0.10.0 this was the normal behaviour,
+ * if this is false, ancestor defaults are completely ignored; prior to 0.11.0 this was the normal behaviour,
* but it caused surprises where default values in parameters did not take effect.
* <p>
* as currently we only really use {@link #localDefaultResolvesWithAncestorValue} true when we
@@ -238,7 +238,7 @@ public class BasicConfigInheritance implements ConfigInheritance {
@Nonnull
protected final Boolean ancestorDefaultInheritable;
- @Deprecated /** @deprecated since 0.10.0 use four-arg constructor */
+ @Deprecated /** @deprecated since 0.11.0 use four-arg constructor */
protected BasicConfigInheritance(boolean isReinherited, @Nullable String conflictResolutionStrategy, boolean localDefaultResolvesWithAncestorValue) {
this(isReinherited, conflictResolutionStrategy, localDefaultResolvesWithAncestorValue, true);
}
@@ -362,7 +362,7 @@ public class BasicConfigInheritance implements ConfigInheritance {
return conflictResolutionStrategy;
}
- @Deprecated /** @deprecated since 0.10.0 when it was introduced, prefer {@link #getLocalDefaultResolvesWithAncestorValue()} */
+ @Deprecated /** @deprecated since 0.11.0 when it was introduced, prefer {@link #getLocalDefaultResolvesWithAncestorValue()} */
public boolean getUseLocalDefaultValue() {
return getLocalDefaultResolvesWithAncestorValue();
}