Merge commit '40e4d627227f584d6212ef588eb3fd658bf159dc'
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/44961356 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/44961356 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/44961356 Branch: refs/heads/KYLIN-2606 Commit: 44961356c1f63fd3d91fb2ded3362219e578c279 Parents: 82b578a 40e4d62 Author: Hongbin Ma <mahong...@apache.org> Authored: Mon Jul 3 16:07:49 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Mon Jul 3 16:07:49 2017 +0800 ---------------------------------------------------------------------- .../apache/kylin/engine/spark/SparkCubingByLayer.java | 2 +- .../org/apache/kylin/engine/spark/SparkExecutable.java | 7 ++++++- .../java/org/apache/kylin/source/hive/HiveMRInput.java | 2 ++ .../kylin/source/kafka/hadoop/KafkaFlatTableJob.java | 2 +- .../cube/v2/coprocessor/endpoint/CubeVisitService.java | 11 ++--------- webapp/app/js/controllers/models.js | 13 ++++++++----- webapp/app/partials/models/models_tree.html | 4 ++-- 7 files changed, 22 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
