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 a122342249e01af16cbbe092a28f912b45b88260 Merge: 7aa849dd04 71f88dde5d Author: Alex Heneveld <[email protected]> AuthorDate: Fri Sep 15 11:09:23 2023 +0100 Merge branch 'shell-workflow-step' .../brooklyn/core/BrooklynFeatureEnablement.java | 7 ++ .../core/location/geo/GeoBytesHostGeoLookup.java | 3 +- .../brooklyn/core/location/geo/HostGeoLookup.java | 9 ++- .../core/location/geo/MaxMind2HostGeoLookup.java | 1 + .../core/location/geo/UtraceHostGeoLookup.java | 1 + .../entitlement/EntitlementManagerAdapter.java | 6 ++ .../core/mgmt/entitlement/Entitlements.java | 16 +++- .../brooklyn/core/server/BrooklynServerConfig.java | 3 + .../workflow/steps/external/ShellWorkflowStep.java | 87 ++++++++++++++++++++++ .../core/mgmt/entitlement/EntitlementsTest.java | 1 + .../brooklyn/core/workflow/WorkflowBasicTest.java | 13 ++-- .../core/workflow/WorkflowBeefyStepTest.java | 6 ++ .../workflow/WorkflowPersistReplayErrorsTest.java | 8 +- karaf/init/src/main/resources/catalog.bom | 5 ++ .../brooklyn/rest/resources/ScriptResource.java | 8 +- 15 files changed, 157 insertions(+), 17 deletions(-)
