Merge remote-tracking branch 'origin/master' into feature-UNOMI-5-KARAF4
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/20909964 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/20909964 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/20909964 Branch: refs/heads/feature-UNOMI-5-KARAF4 Commit: 20909964a94d44114a74acf4d196764164c64499 Parents: b556399 121fbc8 Author: Serge Huber <[email protected]> Authored: Tue Feb 14 10:16:50 2017 +0100 Committer: Serge Huber <[email protected]> Committed: Tue Feb 14 10:16:50 2017 +0100 ---------------------------------------------------------------------- package/pom.xml | 31 ++++++++++ .../src/main/resources/etc/startup.properties | 59 ++++++++++++++++++++ .../PropertyConditionESQueryBuilder.java | 19 +++++-- .../conditions/PropertyConditionEvaluator.java | 48 +++++++++------- 4 files changed, 132 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/20909964/package/pom.xml ----------------------------------------------------------------------
