Merge commit 'c38def7b53dae81f9fde0520b1fb270804dde728'
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c2b2cead Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c2b2cead Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c2b2cead Branch: refs/heads/master Commit: c2b2cead62aa75807075762a529868d6632ddc66 Parents: 2998e11 c38def7 Author: Hongbin Ma <mahong...@apache.org> Authored: Mon Jun 5 14:31:54 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Mon Jun 5 14:31:54 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(-) ----------------------------------------------------------------------
