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/14 01:00:39 UTC

[04/50] [abbrv] incubator-kylin git commit: Merge remote-tracking branch 'origin/staging' into streaming-localdict

Merge remote-tracking branch 'origin/staging' into streaming-localdict


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

Branch: refs/heads/streaming-localdict
Commit: 132b0ca7e179a59b45899a0f77f7891321689236
Parents: 3cc984f 8cca80d
Author: qianhao.zhou <qi...@ebay.com>
Authored: Tue Mar 10 16:56:33 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Tue Mar 10 16:56:33 2015 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/cubeAdvanceSetting.js |   1 +
 webapp/app/js/controllers/cubeDimensions.js     |   1 -
 webapp/app/js/controllers/cubeModel.js          |  21 +--
 webapp/app/js/filters/filter.js                 |   1 +
 webapp/app/less/component.less                  |  17 +--
 .../cubeDesigner/advanced_settings.html         | 141 ++++++++++---------
 .../app/partials/cubeDesigner/data_model.html   |  12 +-
 .../app/partials/cubeDesigner/dimensions.html   |   2 +-
 webapp/app/partials/cubes/cube_schema.html      |   2 +-
 9 files changed, 104 insertions(+), 94 deletions(-)
----------------------------------------------------------------------