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:53 UTC
[18/50] [abbrv] incubator-kylin git commit: Merge branch 'staging' of
https://github.com/KylinOLAP/Kylin into staging
Merge branch 'staging' of https://github.com/KylinOLAP/Kylin into staging
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/2bbaee6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/2bbaee6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/2bbaee6c
Branch: refs/heads/streaming-localdict
Commit: 2bbaee6c2a665dfd6b02dfde3758890e76a82e5b
Parents: a5821c8 83fc04b
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Wed Mar 11 11:22:04 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Wed Mar 11 11:22:04 2015 +0800
----------------------------------------------------------------------
docs/website/download/index.md | 2 +-
.../org/apache/kylin/jdbc/util/SQLTypeMap.java | 6 +-
.../kylin/job/execution/AbstractExecutable.java | 10 +-
server/src/main/resources/kylinSecurity.xml | 2 +-
webapp/app/js/controllers/auth.js | 2 -
webapp/app/js/controllers/cube.js | 2 +-
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/js/listeners.js | 7 -
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 +-
16 files changed, 120 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2bbaee6c/job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java
----------------------------------------------------------------------