You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by li...@apache.org on 2018/04/26 08:12:25 UTC
[02/50] [abbrv] 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/84639846
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/84639846
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/84639846
Branch: refs/heads/griffin-0.2.0-incubating-rc4
Commit: 84639846567ce1bc6ee901bafc2eba7051142d39
Parents: c9a8c8e 2aa58c0
Author: Lionel Liu <bh...@163.com>
Authored: Mon Apr 9 12:03:16 2018 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Mon Apr 9 12:03:16 2018 +0800
----------------------------------------------------------------------
.../core/measure/entity/ExternalMeasure.java | 2 +-
ui/angular/src/app/app.module.ts | 6 +
ui/angular/src/app/health/health.component.ts | 5 +-
.../create-measure.component.html | 31 ++
.../create-measure/pub/pub.component.css | 506 +++++++++++++++++++
.../create-measure/pub/pub.component.html | 211 ++++++++
.../create-measure/pub/pub.component.spec.ts | 43 ++
.../measure/create-measure/pub/pub.component.ts | 216 ++++++++
.../measure-detail.component.html | 8 +
.../measure-detail/measure-detail.component.ts | 1 +
.../src/app/measure/measure.component.css | 12 +
ui/angular/src/app/metric/metric.component.html | 9 +-
ui/angular/src/app/metric/metric.component.ts | 3 +-
ui/angular/src/app/sidebar/sidebar.component.ts | 3 +-
14 files changed, 1044 insertions(+), 12 deletions(-)
----------------------------------------------------------------------