You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/11/14 12:34:13 UTC
[1/2] brooklyn-docs git commit: Refer to inheritance.runtime instead
of deprecated inheritance.runtime
Repository: brooklyn-docs
Updated Branches:
refs/heads/master 62cf36a7d -> 6c4d98ed1
Refer to inheritance.runtime instead of deprecated inheritance.runtime
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/c3001b5a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/c3001b5a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/c3001b5a
Branch: refs/heads/master
Commit: c3001b5a1f025d74da4a175490870afc7de87aa0
Parents: 40c59c6
Author: Valentin Aitken <bo...@gmail.com>
Authored: Tue Nov 14 10:09:39 2017 +0200
Committer: Valentin Aitken <bo...@gmail.com>
Committed: Tue Nov 14 10:09:39 2017 +0200
----------------------------------------------------------------------
guide/blueprints/entity-configuration.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c3001b5a/guide/blueprints/entity-configuration.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/entity-configuration.md b/guide/blueprints/entity-configuration.md
index c2d5794..9b5dd2a 100644
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@ -456,7 +456,7 @@ documented below will be enhanced in a future version of Brooklyn, to better sup
above._
In a YAML blueprint, within the `brooklyn.parameters` section for declaring new config keys, one can
-set the mode for `inheritance.type` and `inheritance.parent` (i.e. for inheritance from the super-type, and
+set the mode for `inheritance.type` and `inheritance.runtime` (i.e. for inheritance from the super-type, and
inheritance in the runtime management hierarchy). The possible values are:
* `deep_merge`: the inherited and the given value should be merged; maps within the map will also be merged
@@ -480,7 +480,7 @@ brooklyn.catalog:
- name: example.map
type: java.util.Map
inheritance.type: deep_merge
- inheritance.parent: none
+ inheritance.runtime: none
default:
MESSAGE_IN_DEFAULT: InDefault
brooklyn.config:
@@ -492,7 +492,7 @@ The blueprints below demonstrate the various permutations for setting configurat
config `example.map`. This can be inspected by looking at the entity's config. The config
we see for app1 is the inherited `{MESSAGE: "Hello"}`; in app2 we define additional configuration,
which will be merged to give `{MESSAGE: "Hello", MESSAGE_IN_CHILD: "InChild"}`; in app3, the
-config from the parent is not inherited because there is an explicit inheritance.parent of "none",
+config from the parent is not inherited because there is an explicit inheritance.runtime of "none",
so it just has the value `{MESSAGE: "Hello"}`; in app4 again the parent's config is ignored,
with the super-type and entity's config being merged to give `{MESSAGE: "Hello", MESSAGE_IN_CHILD: "InChild"}`.
@@ -532,7 +532,7 @@ services:
MESSAGE_IN_CHILD: InChild
```
-A limitations of `inheritance.parent` is when inheriting values from parent and grandparent
+A limitations of `inheritance.runtime` is when inheriting values from parent and grandparent
entities: a value specified on the parent will override (rather than be merged with) the
value on the grandparent.
[2/2] brooklyn-docs git commit: This closes #236
Posted by al...@apache.org.
This closes #236
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/6c4d98ed
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/6c4d98ed
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/6c4d98ed
Branch: refs/heads/master
Commit: 6c4d98ed1797e2ad7eb3d13b56cee3f119096190
Parents: 62cf36a c3001b5
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 14 12:34:04 2017 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 14 12:34:04 2017 +0000
----------------------------------------------------------------------
guide/blueprints/entity-configuration.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------