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/922da1b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/922da1b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/922da1b4 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: 922da1b487e0360bbc6466fd7451d54a1b5724a4 Parents: 1675c93 d8193a0 Author: Lionel Liu <bhlx3l...@163.com> Authored: Wed Feb 7 11:16:47 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Wed Feb 7 11:16:47 2018 +0800 ---------------------------------------------------------------------- .../griffin/core/measure/MeasureController.java | 4 ++-- .../apache/griffin/core/measure/MeasureService.java | 2 +- .../griffin/core/measure/MeasureServiceImpl.java | 13 ++++++++++++- .../griffin/core/metric/MetricController.java | 5 +++-- .../apache/griffin/core/metric/MetricService.java | 2 +- .../griffin/core/metric/MetricServiceImpl.java | 6 +++--- .../org/apache/griffin/core/metric/MetricStore.java | 2 +- .../apache/griffin/core/metric/MetricStoreImpl.java | 16 +++++++++++----- .../griffin/core/measure/MeasureControllerTest.java | 8 +++++--- .../core/measure/MeasureServiceImplTest.java | 5 ++--- .../griffin/core/metric/MetricControllerTest.java | 4 ++-- .../griffin/core/metric/MetricServiceImplTest.java | 12 ++++++------ 12 files changed, 49 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
