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 eee6934d8c82117eb586558dd9e60e5d05840d6f Merge: 1ca2110 0ab9098 Author: Mykola Mandra <[email protected]> AuthorDate: Mon Jul 19 09:44:48 2021 +0100 Merge branch 'master' into logbook-search-improvements .../mgmt/entitlement/WebEntitlementContext.java | 16 ++++- .../apache/brooklyn/rest/BrooklynWebConfig.java | 5 ++ .../rest/filter/EntitlementContextFilter.java | 33 ++++++--- .../security/provider/LdapSecurityProvider.java | 84 ++++++++++++++++++++-- .../rest/resources/LogbookResourceTest.java | 35 ++++++++- .../{logbook.test.log => logbook.log.sample} | 0 6 files changed, 152 insertions(+), 21 deletions(-)
