You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/02/12 06:42:58 UTC
[08/50] incubator-kylin git commit: Merge branch 'inverted-index' of
https://github.com/KylinOLAP/Kylin into inverted-index
Merge branch 'inverted-index' of https://github.com/KylinOLAP/Kylin into inverted-index
Conflicts:
sbin/kylin.sh
sbin/start-kylin-sandbox.sh
sbin/start-kylin.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6e53c4d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6e53c4d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6e53c4d4
Branch: refs/heads/inverted-index
Commit: 6e53c4d4bda1179838ae46fe07aec97b3da7f0f8
Parents: 5038abe 9fb8aaa
Author: qianhao.zhou <qi...@ebay.com>
Authored: Tue Feb 10 16:51:14 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Tue Feb 10 16:51:14 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/jdbc/JDBCDriverTest.java | 12 ++-----
webapp/app/js/controllers/page.js | 1 -
webapp/app/js/controllers/projects.js | 3 +-
webapp/app/js/controllers/sourceMeta.js | 13 ++-----
webapp/app/js/model/projectModel.js | 2 ++
webapp/app/js/model/tableModel.js | 7 +++-
webapp/app/partials/cubes/cube_json_edit.html | 2 +-
webapp/app/partials/jobs/job_submit.html | 38 ++++++++++----------
webapp/bower.json | 5 ++-
9 files changed, 39 insertions(+), 44 deletions(-)
----------------------------------------------------------------------