Merge branch 'master' of https://github.com/liyinan926/helix
Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/d4518db9 Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/d4518db9 Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/d4518db9 Branch: refs/heads/master Commit: d4518db959c0051ca19fd9446ee10270b5b6b20a Parents: 9e51cb7 2a2908a Author: Kanak Biscuitwala <[email protected]> Authored: Sun Nov 1 15:00:44 2015 -0800 Committer: Kanak Biscuitwala <[email protected]> Committed: Sun Nov 1 15:00:44 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/helix/Criteria.java | 4 +- .../helix/messaging/CriteriaEvaluator.java | 35 ++-- .../helix/messaging/CriteriaEvaluatorTest.java | 184 +++++++++++++++++++ 3 files changed, 210 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
