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/d8efb4b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/d8efb4b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/d8efb4b9 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: d8efb4b99b0a475a09a24c35a5b0c94653e35940 Parents: 5f71eee 530c2da Author: Lionel Liu <bhlx3l...@163.com> Authored: Thu Feb 1 16:01:21 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Thu Feb 1 16:01:21 2018 +0800 ---------------------------------------------------------------------- .../griffin/core/metric/MetricStoreImpl.java | 36 ++++++++++++++++---- .../src/main/resources/application.properties | 5 ++- .../core/metric/MetricStoreImplTest.java | 20 +++++++++++ .../src/test/resources/application.properties | 5 ++- 4 files changed, 57 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
