You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/08/20 08:15:53 UTC

[brooklyn-server] 02/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/brooklyn-server

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 90f66ab88b066b8216f8ad78580f91017a9bd8c5
Merge: d068bca a8c9045
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Aug 20 09:15:28 2021 +0100

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/brooklyn-server

 .../apache/brooklyn/core/mgmt/entitlement/WebEntitlementContext.java  | 2 +-
 .../java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java | 4 ++--
 .../org/apache/brooklyn/rest/filter/EntitlementContextFilter.java     | 4 +++-
 .../apache/brooklyn/rest/security/provider/LdapSecurityProvider.java  | 3 +++
 4 files changed, 9 insertions(+), 4 deletions(-)