Merge PR #18
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/173c1ebd Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/173c1ebd Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/173c1ebd Branch: refs/heads/feature-UNOMI-28-ES2X Commit: 173c1ebd340d3e94ff2558831a513f19d1ea6d52 Parents: b46a599 cb72a0e Author: Serge Huber <[email protected]> Authored: Fri Nov 25 14:08:19 2016 +0100 Committer: Serge Huber <[email protected]> Committed: Fri Nov 25 14:08:19 2016 +0100 ---------------------------------------------------------------------- .../unomi/privacy/internal/PrivacyServiceImpl.java | 2 +- .../org/apache/unomi/itests/ConditionEvaluatorTest.java | 2 +- .../conditions/PropertyConditionESQueryBuilder.java | 6 ++++++ .../conditions/PropertyConditionEvaluator.java | 12 +++++++++++- 4 files changed, 19 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
