Merge commit '53aafa97e150d8ac9dd4dfc54d6b55b12a70240c'
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c38def7b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c38def7b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c38def7b Branch: refs/heads/master Commit: c38def7b53dae81f9fde0520b1fb270804dde728 Parents: 25a5367 53aafa9 Author: Hongbin Ma <mahong...@apache.org> Authored: Mon Jun 5 13:22:06 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Mon Jun 5 13:22:06 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/job/JobInstance.java | 16 +++++++++++++++ .../kylin/job/execution/AbstractExecutable.java | 21 ++++++++++++++++---- .../job/execution/DefaultChainedExecutable.java | 12 +++++++++-- .../engine/mr/common/JobInfoConverter.java | 3 ++- .../apache/kylin/tool/JobInstanceExtractor.java | 3 ++- webapp/app/partials/query/query.html | 2 ++ 6 files changed, 49 insertions(+), 8 deletions(-) ----------------------------------------------------------------------