Repository: incubator-griffin Updated Branches: refs/heads/griffin-0.2.0-incubating-rc1 [created] 2c02bc0ef
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/417926a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/417926a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/417926a9 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 417926a93683ebf2e1205344d52432c05bf19745 Parents: 649acb8 8e0afa4 Author: Lionel Liu <bhlx3l...@163.com> Authored: Wed Nov 22 14:38:33 2017 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Wed Nov 22 14:38:33 2017 +0800 ---------------------------------------------------------------------- griffin-doc/postman/griffin.json | 7 +++++++ .../apache/griffin/core/job/SparkSubmitJob.java | 18 +++++++++++------ .../measure/entity/AbstractAuditableEntity.java | 4 ++-- .../griffin/core/measure/entity/Rule.java | 21 ++++++++++++++++++-- .../griffin/core/measure/MeasureTestHelper.java | 2 +- 5 files changed, 41 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
