brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject brooklyn-server git commit: Fix master build
Date Mon, 31 Oct 2016 16:50:00 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 387a19749 -> c4cc0d1bd


Fix master build


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c4cc0d1b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c4cc0d1b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c4cc0d1b

Branch: refs/heads/master
Commit: c4cc0d1bdca2c26c6c9fd13dae36e6b9c5b03513
Parents: 387a197
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Mon Oct 31 17:34:53 2016 +0200
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Mon Oct 31 17:34:53 2016 +0200

----------------------------------------------------------------------
 .../org/apache/brooklyn/entity/software/base/SoftwareProcess.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c4cc0d1b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcess.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcess.java
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcess.java
index aab22b2..325d5a5 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcess.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcess.java
@@ -173,7 +173,7 @@ public interface SoftwareProcess extends Entity, Startable {
     MapConfigKey<Object> TEMPLATE_SUBSTITUTIONS = new MapConfigKey.Builder<Object>(Object.class,
"template.substitutions")
             .description("Map of values to be substituted for the keys in any templated files
used by the entity")
             .defaultValue(ImmutableMap.<String,Object>of())
-            .typeInheritance(ConfigInheritance.DEEP_MERGE)
+            .typeInheritance(BasicConfigInheritance.DEEP_MERGE)
             .build();
 
     /**


Mime
View raw message