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/e3f3fcf7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/e3f3fcf7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/e3f3fcf7 Branch: refs/heads/griffin-0.2.0-incubating-spark1 Commit: e3f3fcf73acbef2385e1a1b89bcafbd271088497 Parents: df39f94 ecfbcef Author: Lionel Liu <[email protected]> Authored: Wed Apr 25 17:29:02 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Wed Apr 25 17:29:02 2018 +0800 ---------------------------------------------------------------------- griffin-doc/docker/griffin-docker-guide.md | 2 +- ui/angular/src/app/measure/create-measure/ac/ac.component.html | 2 +- ui/angular/src/app/measure/create-measure/ac/ac.component.ts | 2 ++ ui/angular/src/app/measure/create-measure/pr/pr.component.html | 2 +- ui/angular/src/app/measure/create-measure/pr/pr.component.ts | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
