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-rc2 Commit: e72cea84e28f67b5e72bb24deb41f4919fd97f7e Parents: 6ef8764 fdcd7f7 Author: Lionel Liu <bhlx3l...@163.com> Authored: Wed Feb 7 16:18:52 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> 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(-) ----------------------------------------------------------------------
