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 b1fc234fba1c9ec613a4cbb7e8d7fd38d49160cf Merge: 004746e 6ac7b71 Author: zan-mateusz <[email protected]> AuthorDate: Fri Jul 16 12:35:52 2021 +0100 Merge branch 'feature/working-peristence-import-api' of github.com:zan-mateusz/brooklyn-server into feature/working-peristence-import-api .../org/apache/brooklyn/core/config/Sanitizer.java | 21 +++++++ .../brooklyn/core/mgmt/BrooklynTaskTags.java | 5 +- .../apache/brooklyn/core/mgmt/ha/OsgiManager.java | 2 +- .../apache/brooklyn/rest/api/EntityConfigApi.java | 33 ++++++++++- .../org/apache/brooklyn/rest/api/SensorApi.java | 21 +++++-- .../resources/AbstractBrooklynRestResource.java | 64 ++++++++++++++++++++-- .../rest/resources/ApplicationResource.java | 6 +- .../rest/resources/EntityConfigResource.java | 56 +++++++++++++++---- .../brooklyn/rest/resources/SensorResource.java | 17 +++--- .../brooklyn/rest/util/WebResourceUtils.java | 5 +- .../rest/resources/SensorResourceTest.java | 33 +++++++---- 11 files changed, 209 insertions(+), 54 deletions(-)
