This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
from 4e2fcaa300 Merge remote-tracking branch 'nakomis/bundle-icons'
new d5bf4b0176 fix one test which is too strict around millisecond
rounding in Instant
new d3b3f7cf0e correctly exclude some uninheritable keys in edge case
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../config/internal/AbstractConfigMapImpl.java | 10 +++-
.../core/entity/ConfigEntityInheritanceTest.java | 70 +++++++++++++---------
.../util/json/BrooklynJacksonSerializerTest.java | 3 +-
.../java/org/apache/brooklyn/config/ConfigMap.java | 2 +-
4 files changed, 53 insertions(+), 32 deletions(-)
