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/03/03 11:08:11 UTC

[15/26] incubator-kylin git commit: Merge remote-tracking branch 'origin/inverted-index' into streaming

Merge remote-tracking branch 'origin/inverted-index' into streaming


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/9c3a6067
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/9c3a6067
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/9c3a6067

Branch: refs/heads/streaming
Commit: 9c3a60673fa31b9c900a18850f292ff7401410da
Parents: 04d9b7d 82c9db2
Author: qianhao.zhou <qi...@ebay.com>
Authored: Mon Mar 2 10:00:24 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Mon Mar 2 10:00:24 2015 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/cube.js               |   0
 webapp/app/js/controllers/cubeEdit.js           |  11 +-
 webapp/app/js/controllers/cubeSchema.js         |   8 +-
 webapp/app/js/controllers/cubes.js              |   4 +-
 webapp/app/js/controllers/sourceMeta.js         |  37 ++---
 webapp/app/js/model/tableModel.js               |  92 ++++++-----
 webapp/app/js/services/tables.js                |   0
 webapp/app/js/services/tree.js                  | 161 ++++++++++---------
 .../cubeDesigner/advanced_settings.html         |  34 ++--
 .../app/partials/cubeDesigner/incremental.html  |   2 +-
 webapp/app/partials/cubes/cube_detail.html      |  12 +-
 webapp/app/partials/tables/source_metadata.html |  44 ++---
 .../app/partials/tables/source_table_tree.html  |   6 +-
 webapp/bower.json                               |   4 +-
 14 files changed, 222 insertions(+), 193 deletions(-)
----------------------------------------------------------------------