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/5c04884f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/5c04884f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/5c04884f Branch: refs/heads/griffin-0.2.0-incubating-spark1 Commit: 5c04884f1bacde14525c1c468b41dda9260314be Parents: 3acba18 d6b4abb Author: Lionel Liu <[email protected]> Authored: Thu May 10 18:06:58 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Thu May 10 18:06:58 2018 +0800 ---------------------------------------------------------------------- griffin-doc/service/api-guide.md | 10 ++++ .../core/exception/GriffinExceptionMessage.java | 1 + .../apache/griffin/core/job/JobController.java | 17 +++++- .../core/measure/MeasureOrgServiceImpl.java | 2 + .../org/apache/griffin/core/util/FSUtil.java | 59 ++++++++++++++------ 5 files changed, 71 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
