GitHub user aledsage opened a pull request:
https://github.com/apache/brooklyn-server/pull/173
BROOKLYN-286: merge config keys map values
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aledsage/brooklyn-server merge-config
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-server/pull/173.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #173
----
commit 123ed23b9477188ff7580dfca0d6030ef4361f5b
Author: Aled Sage <[email protected]>
Date: 2016-05-26T09:39:52Z
Rename TestEntity confMapThing.obj to confMapObjThing
The previous name caused problems because there is also a
âconfMapThingâ of type MapConfigKey. That has special behaviour,
where it looks up any config with that prefix - so it picked up
any config defined against confMapThing.obj as well.
commit 66e7b291c79acba125113bd41835397459a03916
Author: Aled Sage <[email protected]>
Date: 2016-05-26T09:40:37Z
AbstractYamlTest.setUp/tearDown throws Exception
commit 14cc40b6ffc4c59425a29387ffda5c764a602c58
Author: Aled Sage <[email protected]>
Date: 2016-05-26T10:01:30Z
Add YAML config tests
commit 27e43c119c9e10c78fd36483aed10c7d14d4225c
Author: Aled Sage <[email protected]>
Date: 2016-05-27T08:40:03Z
Adds CollectionMerger, for merging maps
commit 67e904b31a770959a3082bb5945c0fb08b4d7a25
Author: Aled Sage <[email protected]>
Date: 2016-05-27T08:43:53Z
Makes config parent-inheritance âmergeâ configurable
Adds:
* ConfigKey.getParentInheritance (deprecating getInheritance)
* ConfigKey.getTypeInheritance (not yet implemented)
* Adds MapConfigKey.Builder
* Some SoftwareProcess config keys now set typeInheritance(MERGE)
Breaking backwards-compatibility changes:
* ConfigInheritance.isInherited return type changed (method was @Beta)
* VanillaSoftwareProcess keys changed to MapConfigKey, rather than
ConfigKey<Map>
* BasicConfigKey.Builder: generics changed, to allow sub-typing by
MapConfigKey.Builder
* AbstractStructuredConfigKey.subType field changed from public to
protected
Change of semantics:
* Previously, when looking up entity config, the order of preference
(in EntityConfigMap) was:
1. look up own config, using key
2. look up inherited config, using key
3. look up âown bagâ, using keyâs name
4. look up âinherited bagâ, using keyâs name.
Now the order is (1), (3), (2), (4).
commit b94dd1015a6da86d82b2cbb5efc4bb2206a9124c
Author: Aled Sage <[email protected]>
Date: 2016-05-27T08:44:09Z
Implement ConfigKey.typeInheritance
commit f9228c32ddf7ca66a0492ef5241d2990247ddd41
Author: Aled Sage <[email protected]>
Date: 2016-06-01T16:31:17Z
Refactor stubbing of jclouds for tests
commit e65527c3ff76173882b335e0bb6c87604f01bd20
Author: Aled Sage <[email protected]>
Date: 2016-06-01T16:34:17Z
Adds JcloudsLocation.LOOKUP_AWS_HOSTNAME
commit 09a5777e175286c82ec8dbc78672f2ff7d7dfb1f
Author: Aled Sage <[email protected]>
Date: 2016-06-01T16:37:48Z
JcloudsLocation.templateOptions values merged
If passed templateOptions via an entityâs provisioning.properties and
also have templateOptions in the location config, then merge them.
commit fee4df6fadd006f1d3d36777e80f2e2ebc1b5793
Author: Aled Sage <[email protected]>
Date: 2016-06-01T16:57:50Z
Disable EntityConfigTest.testGetConfigNonBlocking
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
