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:01:54 UTC
[09/50] [abbrv] incubator-kylin git commit: Merge branch 'staging'
Merge branch '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/ef27f3a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/ef27f3a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/ef27f3a1
Branch: refs/heads/staging
Commit: ef27f3a16c7cd01d073ef7e56f6f13eb27588ac3
Parents: a3b4bcc fcae14e
Author: lukehan <lu...@apache.org>
Authored: Fri Mar 6 14:55:31 2015 +0800
Committer: lukehan <lu...@apache.org>
Committed: Fri Mar 6 14:55:31 2015 +0800
----------------------------------------------------------------------
bin/kylin.sh | 79 ++++
bin/start-kylin.sh | 55 ---
bin/stop-kylin.sh | 21 -
.../model/validation/rule/RowKeyAttrRule.java | 4 +-
docs/website/download/index.md | 19 +-
job/pom.xml | 9 +
.../kylin/metadata/model/PartitionDesc.java | 3 +-
.../kylin/rest/controller/CubeController.java | 8 +-
webapp/app/js/controllers/admin.js | 431 +++++++++----------
webapp/app/js/controllers/cubeAdvanceSetting.js | 8 +
webapp/app/js/controllers/cubeEdit.js | 71 ++-
webapp/app/js/controllers/cubeSchema.js | 57 ++-
webapp/app/js/controllers/cubes.js | 55 +--
webapp/app/js/controllers/page.js | 2 +-
webapp/app/js/controllers/sourceMeta.js | 62 +--
webapp/app/js/model/projectModel.js | 3 +
webapp/app/js/model/tableModel.js | 78 +++-
.../cubeDesigner/advanced_settings.html | 6 +-
.../app/partials/cubeDesigner/incremental.html | 12 +-
webapp/app/partials/cubes/cube_schema.html | 2 +-
webapp/app/partials/jobs/job_merge.html | 2 +-
webapp/app/partials/jobs/job_refresh.html | 2 +-
webapp/app/partials/jobs/job_submit.html | 170 ++++----
webapp/app/partials/query/query.html | 4 +-
webapp/app/partials/query/query_detail.html | 17 +-
.../app/partials/tables/source_table_tree.html | 2 +-
26 files changed, 652 insertions(+), 530 deletions(-)
----------------------------------------------------------------------