You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2018/03/07 02:28:34 UTC
[26/50] incubator-griffin git commit: Merge branch 'master' of
https://github.com/apache/incubator-griffin into apache-master
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/e1f5b04c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/e1f5b04c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/e1f5b04c
Branch: refs/heads/griffin-0.2.0-incubating-rc1
Commit: e1f5b04c996dd52bd2b24dc7e98023b5ae49b7dc
Parents: 3d48ade a926972
Author: Lionel Liu <bh...@163.com>
Authored: Fri Feb 2 18:22:17 2018 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Fri Feb 2 18:22:17 2018 +0800
----------------------------------------------------------------------
.../apache/griffin/core/job/JobController.java | 7 +++-
.../org/apache/griffin/core/job/JobService.java | 7 +++-
.../apache/griffin/core/job/JobServiceImpl.java | 5 +--
.../core/measure/entity/GriffinMeasure.java | 12 ------
.../griffin/core/measure/entity/Measure.java | 20 +++++++--
.../griffin/core/metric/MetricServiceImpl.java | 2 +-
.../griffin/core/metric/MetricStoreImpl.java | 43 ++++++++++++--------
.../griffin/core/metric/model/Metric.java | 12 +++++-
.../griffin/core/job/JobControllerTest.java | 5 +--
.../griffin/core/job/JobServiceImplTest.java | 4 +-
.../core/metric/MetricControllerTest.java | 2 +-
.../core/metric/MetricStoreImplTest.java | 19 +++++++++
12 files changed, 89 insertions(+), 49 deletions(-)
----------------------------------------------------------------------