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:02:11 UTC
[26/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/76e5fd3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/76e5fd3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/76e5fd3e
Branch: refs/heads/staging
Commit: 76e5fd3e7ada79046ee7ee2b844e5dfdbbfbeaf5
Parents: 30991df 2157fe5
Author: lukehan <lu...@apache.org>
Authored: Mon Mar 9 17:25:28 2015 -0700
Committer: lukehan <lu...@apache.org>
Committed: Mon Mar 9 17:25:28 2015 -0700
----------------------------------------------------------------------
.../org/apache/kylin/cube/model/CubeDesc.java | 4 -
.../org/apache/kylin/jdbc/util/SQLTypeMap.java | 6 +-
.../kylin/metadata/model/DataModelDesc.java | 5 ++
.../kylin/metadata/model/PartitionDesc.java | 12 +--
.../metadata/tool/HiveSourceTableLoader.java | 13 ++-
webapp/app/js/controllers/cubeEdit.js | 90 +++++++++++++-------
webapp/app/js/controllers/cubeModel.js | 35 ++++++--
webapp/app/js/controllers/cubeSchema.js | 7 --
webapp/app/js/model/jobListModel.js | 11 ---
webapp/app/js/model/metaModel.js | 2 +-
.../cubeDesigner/advanced_settings.html | 1 +
.../app/partials/cubeDesigner/dimensions.html | 1 -
.../app/partials/cubeDesigner/incremental.html | 10 ++-
13 files changed, 121 insertions(+), 76 deletions(-)
----------------------------------------------------------------------