You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/11/23 15:28:50 UTC
[1/2] incubator-brooklyn git commit: Fix
BrooklynProperties.Factory.Builder.builderEmpty
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 15faad338 -> cf4d77b1d
Fix BrooklynProperties.Factory.Builder.builderEmpty
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7364f34c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7364f34c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7364f34c
Branch: refs/heads/master
Commit: 7364f34c7beaaa43d9bddf45aea0e85f36e596fd
Parents: 15faad3
Author: Valentin Aitken <va...@cloudsoftcorp.com>
Authored: Mon Nov 23 12:17:10 2015 +0200
Committer: Valentin Aitken <va...@cloudsoftcorp.com>
Committed: Mon Nov 23 14:48:37 2015 +0200
----------------------------------------------------------------------
.../org/apache/brooklyn/core/internal/BrooklynProperties.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7364f34c/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java
index fc2b269..c1ffb42 100644
--- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java
+++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java
@@ -85,7 +85,7 @@ public class BrooklynProperties extends LinkedHashMap implements StringConfigMap
}
public static Builder builderEmpty() {
- return new Builder(true);
+ return new Builder(false);
}
public static class Builder {
@@ -100,7 +100,6 @@ public class BrooklynProperties extends LinkedHashMap implements StringConfigMap
this(true);
}
- // TODO it's always called with true here, perhaps we don't need the argument?
private Builder(boolean setGlobalFileDefaults) {
resetDefaultLocationMetadataUrl();
if (setGlobalFileDefaults) {
[2/2] incubator-brooklyn git commit: This closes #1055
Posted by sj...@apache.org.
This closes #1055
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/cf4d77b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/cf4d77b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/cf4d77b1
Branch: refs/heads/master
Commit: cf4d77b1d7efb7e44504d5899f7b0936b91341c5
Parents: 15faad3 7364f34
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Mon Nov 23 14:28:30 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Mon Nov 23 14:28:30 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/core/internal/BrooklynProperties.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------