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

2018-03-29 Thread 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/6d684017
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/6d684017
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/6d684017

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: 6d684017f1269980202734112ec91507b6bc000f
Parents: eedd1d4 9e7fdfa
Author: Lionel Liu 
Authored: Mon Feb 12 16:40:37 2018 +0800
Committer: Lionel Liu 
Committed: Mon Feb 12 16:40:37 2018 +0800

--
 measure/pom.xml |  2 +-
 pom.xml |  2 +-
 service/pom.xml |  2 +-
 .../app/job/create-job/create-job.component.ts  | 28 +++-
 .../measure/create-measure/pr/pr.component.ts   |  4 +--
 ui/pom.xml  |  2 +-
 6 files changed, 28 insertions(+), 12 deletions(-)
--

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

2018-03-29 Thread 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/6d684017
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/6d684017
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/6d684017

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: 6d684017f1269980202734112ec91507b6bc000f
Parents: eedd1d4 9e7fdfa
Author: Lionel Liu 
Authored: Mon Feb 12 16:40:37 2018 +0800
Committer: Lionel Liu 
Committed: Mon Feb 12 16:40:37 2018 +0800

--
 measure/pom.xml |  2 +-
 pom.xml |  2 +-
 service/pom.xml |  2 +-
 .../app/job/create-job/create-job.component.ts  | 28 +++-
 .../measure/create-measure/pr/pr.component.ts   |  4 +--
 ui/pom.xml  |  2 +-
 6 files changed, 28 insertions(+), 12 deletions(-)
--

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

2018-03-29 Thread 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/6d684017
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/6d684017
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/6d684017

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: 6d684017f1269980202734112ec91507b6bc000f
Parents: eedd1d4 9e7fdfa
Author: Lionel Liu 
Authored: Mon Feb 12 16:40:37 2018 +0800
Committer: Lionel Liu 
Committed: Mon Feb 12 16:40:37 2018 +0800

--
 measure/pom.xml |  2 +-
 pom.xml |  2 +-
 service/pom.xml |  2 +-
 .../app/job/create-job/create-job.component.ts  | 28 +++-
 .../measure/create-measure/pr/pr.component.ts   |  4 +--
 ui/pom.xml  |  2 +-
 6 files changed, 28 insertions(+), 12 deletions(-)
--

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

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

Branch: refs/heads/griffin-0.2.0-incubating-rc1
Commit: e72cea84e28f67b5e72bb24deb41f4919fd97f7e
Parents: 6ef8764 fdcd7f7
Author: Lionel Liu 
Authored: Wed Feb 7 16:18:52 2018 +0800
Committer: Lionel Liu 
Committed: Wed Feb 7 16:18:52 2018 +0800

--
 griffin-doc/docker/griffin-docker-guide.md |  2 +-
 .../org/apache/griffin/core/job/JobInstance.java   | 17 -
 .../apache/griffin/core/job/JobServiceImpl.java|  2 +-
 .../apache/griffin/core/job/SparkSubmitJob.java| 14 +++---
 .../griffin/core/job/entity/JobDataSegment.java|  2 +-
 .../griffin/core/job/entity/JobSchedule.java   |  6 +++---
 .../griffin/core/measure/entity/DataConnector.java |  2 +-
 .../org/apache/griffin/core/util/TimeUtil.java |  4 ++--
 8 files changed, 24 insertions(+), 25 deletions(-)
--

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

2018-03-06 Thread 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/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 
Authored: Wed Feb 7 15:13:45 2018 +0800
Committer: Lionel Liu 
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(-)
--