[41/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

[guoyp]

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/d000dab0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/d000dab0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/d000dab0

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: d000dab068795fc67c9eac14c08782dd0b2e50d1
Parents: f00fc4e 07121ba
Author: Lionel Liu 
Authored: Wed Mar 21 16:05:21 2018 +0800
Committer: Lionel Liu 
Committed: Wed Mar 21 16:05:21 2018 +0800

--
 griffin-doc/FSD.md| 4 ++--
 ui/angular/src/app/login/login.component.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--

[41/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

[guoyp]

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/d000dab0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/d000dab0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/d000dab0

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: d000dab068795fc67c9eac14c08782dd0b2e50d1
Parents: f00fc4e 07121ba
Author: Lionel Liu 
Authored: Wed Mar 21 16:05:21 2018 +0800
Committer: Lionel Liu 
Committed: Wed Mar 21 16:05:21 2018 +0800

--
 griffin-doc/FSD.md| 4 ++--
 ui/angular/src/app/login/login.component.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--

[41/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

[guoyp]

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/eedd1d48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/eedd1d48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/eedd1d48

Branch: refs/heads/griffin-0.2.0-incubating-rc1
Commit: eedd1d48de7d34d8845600c7f90ce477b1b32814
Parents: 169a47b b2f334a
Author: Lionel Liu 
Authored: Mon Feb 12 10:56:09 2018 +0800
Committer: Lionel Liu 
Committed: Mon Feb 12 10:56:09 2018 +0800

--
 README.md   |  225 +-
 griffin-doc/service/api-guide.md|  858 ---
 griffin-doc/service/postman/griffin.json| 2333 ++
 .../griffin/core/metric/MetricStoreImpl.java|6 +-
 4 files changed, 1983 insertions(+), 1439 deletions(-)
--