Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/0062c744 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/0062c744 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/0062c744 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 0062c74401a76f573930cd5bb52fc5864057f4f6 Parents: 417926a 8d1707f Author: Lionel Liu <bhlx3l...@163.com> Authored: Wed Nov 22 17:13:11 2017 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Wed Nov 22 17:13:11 2017 +0800 ---------------------------------------------------------------------- .../griffin/core/measure/entity/Rule.java | 27 +++++++++++++++++--- .../core/measure/MeasureControllerTest.java | 13 +++++----- .../griffin/core/measure/MeasureTestHelper.java | 4 ++- 3 files changed, 33 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
