This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 7eda859e4aca3b4d180773e5fd755b4f8b5e7358
Merge: 61d759ded9 a85eff4fac
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Tue Apr 9 11:55:23 2024 +0100
Merge branch 'tidy-config'
.../core/config/BasicConfigInheritance.java | 2 +-
.../config/internal/AbstractConfigMapImpl.java | 49 +++-----
.../internal/ConfigMapViewWithStringKeys.java | 132 ---------------------
.../core/entity/internal/EntityConfigMap.java | 48 ++++----
.../brooklyn/core/internal/BrooklynProperties.java | 2 +-
.../core/location/internal/LocationConfigMap.java | 5 -
.../objs/AbstractConfigurationSupportInternal.java | 6 +-
.../brooklyn/core/objs/AdjunctConfigMap.java | 18 +--
.../core/entity/ConfigEntityInheritanceTest.java | 71 ++++++++++-
.../java/org/apache/brooklyn/config/ConfigMap.java | 27 +----
.../apache/brooklyn/config/StringConfigMap.java | 6 +-
11 files changed, 113 insertions(+), 253 deletions(-)
