This is an automated email from the ASF dual-hosted git repository. duncangrant pushed a commit to branch ruby-3 in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
commit 1f518ac10af3629c57c37262f9d382011045e585 Merge: 499186d 6c4d98e Author: Alex Heneveld <[email protected]> AuthorDate: Tue Sep 4 14:44:22 2018 +0100 Merge commit '6c4d98ed' into release-5.0-reverted-222 guide/blueprints/entity-configuration.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --cc guide/blueprints/entity-configuration.md index 97b6824,9b5dd2a..7ca2633 --- a/guide/blueprints/entity-configuration.md +++ b/guide/blueprints/entity-configuration.md @@@ -533,9 -530,9 +533,9 @@@ services brooklyn.config: example.map: MESSAGE_IN_CHILD: InChild -``` +{% endhighlight %} - 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.
