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 004746eda0d9b62d9334ab5459ae0e847f6fcfad Merge: e7997e7 1db6e58 Author: zan-mateusz <mateusz....@cloudsoftcorp.com> AuthorDate: Wed Jul 14 15:18:06 2021 +0100 Merge branch 'feature/working-peristence-import-api' of github.com:zan-mateusz/brooklyn-server into feature/working-peristence-import-api .../ha/ManagementPlaneSyncRecordPersister.java | 3 + .../core/mgmt/ha/HighAvailabilityManagerImpl.java | 7 +- ...ementPlaneSyncRecordPersisterToObjectStore.java | 28 +++ .../BrooklynMementoPersisterToObjectStore.java | 2 + .../mgmt/persist/BrooklynPersistenceUtils.java | 30 ++- .../mgmt/rebind/PeriodicDeltaChangeListener.java | 9 + .../util/core/logbook/LogBookQueryParams.java | 54 +++-- .../util/core/logbook/file/FileLogStore.java | 84 ++++--- .../logbook/opensearch/OpenSearchLogStore.java | 79 +++++-- .../util/core/logbook/file/FileLogStoreTest.java | 243 +++++++++++++++++++++ .../logbook/opensearch/OpenSearchLogStoreTest.java | 65 ++++-- .../brooklyn/util/core/logbook/file/log-sample.txt | 25 +++ .../brooklyn/rest/filter/CsrfTokenFilter.java | 9 +- .../rest/resources/LogbookResourceTest.java | 4 +- 14 files changed, 556 insertions(+), 86 deletions(-)