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

Posted to dev@unomi.apache.org by sh...@apache.org on 2022/02/23 08:07:20 UTC

[unomi] 01/02: Merge remote-tracking branch 'origin/master' into UNOMI-486-json-schema-graphql

This is an automated email from the ASF dual-hosted git repository.

shuber pushed a commit to branch UNOMI-486-json-schema-graphql
in repository https://gitbox.apache.org/repos/asf/unomi.git

commit 7eb64eec80c5c8b872523b43db1c7bcc4ddbc3e5
Merge: 68940c3 a0bfe54
Author: Serge Huber <sh...@jahia.com>
AuthorDate: Wed Feb 23 08:43:43 2022 +0100

    Merge remote-tracking branch 'origin/master' into UNOMI-486-json-schema-graphql

 NOTICE                                             |  2 +-
 .../karaf-kar/src/main/feature/feature.xml         |  2 +-
 .../org/apache/unomi/itests/RuleServiceIT.java     |  7 ++--
 .../java/org/apache/unomi/itests/SegmentIT.java    |  5 +++
 .../org/apache/unomi/lifecycle/BundleWatcher.java  | 38 +++++++++++++---------
 .../actions/MergeProfilesOnPropertyAction.java     | 15 ++++++---
 6 files changed, 45 insertions(+), 24 deletions(-)