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 8b1044f311eebe4c2ecf58eac7ba0ac20e139501 Merge: 57469d8c90 a25cf31150 Author: Alex Heneveld <[email protected]> AuthorDate: Wed Nov 30 12:50:32 2022 +0000 Merge branch 'master' into workflow-nested .../org/apache/brooklyn/core/feed/AbstractFeed.java | 5 +++++ .../brooklyn/core/sensor/DurationSinceSensor.java | 6 ++---- .../brooklyn/core/sensor/function/FunctionSensor.java | 6 ++---- .../apache/brooklyn/core/workflow/WorkflowSensor.java | 4 +--- .../brooklyn/entity/group/DynamicClusterImpl.java | 2 +- .../brooklyn/entity/group/DynamicMultiGroupImpl.java | 2 +- .../apache/brooklyn/entity/stock/DataEntityImpl.java | 2 +- .../apache/brooklyn/feed/function/FunctionFeed.java | 7 ++++++- .../java/org/apache/brooklyn/feed/http/HttpFeed.java | 8 +++++--- .../brooklyn/core/mgmt/rebind/RebindFeedTest.java | 6 +++--- .../brooklyn/entity/group/DynamicClusterTest.java | 1 + .../brooklyn/feed/function/FunctionFeedTest.java | 12 ++++++------ karaf/init/src/main/resources/brooklyn/icons/group.png | Bin 0 -> 15884 bytes karaf/init/src/main/resources/catalog.bom | 7 +++++++ .../brooklyn/container/entity/helm/HelmEntityImpl.java | 14 +++++++------- .../brooklyn/policy/enricher/HttpLatencyDetector.java | 17 ++++++++++++++--- .../brooklyn/policy/enricher/RebindEnricherTest.java | 11 ++++++++++- .../brooklyn/rest/resources/SensorResourceTest.java | 2 +- .../entity/brooklynnode/BrooklynClusterImpl.java | 4 ++-- .../entity/brooklynnode/BrooklynEntityMirrorImpl.java | 2 +- .../entity/software/base/SoftwareProcessImpl.java | 2 +- .../apache/brooklyn/tasks/kubectl/ContainerSensor.java | 4 ++-- .../base/SoftwareProcessEntityFeedRebindTest.java | 7 +++---- .../software/base/lifecycle/ScriptHelperTest.java | 2 +- 24 files changed, 83 insertions(+), 50 deletions(-)
