Merge branch 'apache-master' into tmst
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/7f613191 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/7f613191 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/7f613191 Branch: refs/heads/griffin-0.2.0-incubating-rc4 Commit: 7f613191a8b1ae53a581a0ce74a9d62b75660337 Parents: 7e20b37 8463984 Author: Lionel Liu <[email protected]> Authored: Mon Apr 9 12:03:27 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Mon Apr 9 12:03:27 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(-) ----------------------------------------------------------------------
