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/6ef8764f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/6ef8764f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/6ef8764f Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 6ef8764f313a42d132f97a9dbd38a1b87bcbe226 Parents: 922da1b d063c03 Author: Lionel Liu <bhlx3l...@163.com> Authored: Wed Feb 7 15:13:45 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Wed Feb 7 15:13:45 2018 +0800 ---------------------------------------------------------------------- ui/angular/src/app/app.component.html | 6 +- ui/angular/src/app/health/health.component.ts | 4 +- .../app/job/create-job/create-job.component.ts | 2 +- ui/angular/src/app/job/job.component.ts | 1 - .../measure/create-measure/ac/ac.component.html | 4 +- .../measure/create-measure/ac/ac.component.ts | 8 +- .../detail-metric/detail-metric.component.css | 91 ++++++++++---------- .../detail-metric/detail-metric.component.html | 30 +++---- .../detail-metric/detail-metric.component.ts | 4 +- ui/angular/src/app/metric/metric.component.ts | 4 +- ui/angular/src/app/service/chart.service.ts | 2 +- ui/angular/src/app/service/user.service.ts | 1 - ui/angular/src/app/sidebar/sidebar.component.ts | 4 +- 13 files changed, 80 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
