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/28 01:04:55 UTC
[04/19] 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/43b843aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/43b843aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/43b843aa
Branch: refs/heads/staging
Commit: 43b843aa337fe371c55c4837cfd3527ab5299da6
Parents: 2efaf25 4f6869e
Author: lukehan <lu...@apache.org>
Authored: Mon Mar 16 12:30:14 2015 -0700
Committer: lukehan <lu...@apache.org>
Committed: Mon Mar 16 12:30:14 2015 -0700
----------------------------------------------------------------------
bin/check-env.sh | 7 +-
bin/kylin.sh | 2 +-
bin/sample.sh | 11 +
.../kylin/common/restclient/Broadcaster.java | 4 +-
conf/kylin.properties | 2 +-
.../apache/kylin/dict/DateStrDictionary.java | 18 +-
.../kylin/dict/DateStrDictionaryTest.java | 27 +
docs/Installation/install_and_run.md | 23 +-
examples/sample_cube/create_sample_tables.sql | 172 +
.../sample_cube/data/DEFAULT.KYLIN_CAL_DT.csv | 731 ++
.../data/DEFAULT.KYLIN_CATEGORY_GROUPINGS.csv | 144 +
.../sample_cube/data/DEFAULT.KYLIN_SALES.csv | 10000 +++++++++++++++++
.../metadata/cube/kylin_sales_cube.json | 10 +
.../cube_desc/kylin_sales_cube_desc.json | 178 +
.../metadata/model_desc/kylin_sales_model.json | 28 +
.../metadata/project/learn_kylin.json | 11 +
.../metadata/table/DEFAULT.KYLIN_CAL_DT.json | 407 +
.../table/DEFAULT.KYLIN_CATEGORY_GROUPINGS.json | 151 +
.../metadata/table/DEFAULT.KYLIN_SALES.json | 43 +
.../test_case_data/sandbox/kylin.properties | 2 +-
.../kylin/metadata/project/ProjectManager.java | 2 +-
script/compress.sh | 2 +-
script/prepare.sh | 2 +
.../apache/kylin/rest/service/BasicService.java | 2 +-
.../apache/kylin/rest/service/CacheService.java | 24 +
.../org/apache/kylin/storage/tuple/Tuple.java | 4 +-
webapp/app/js/services/cache.js | 2 +-
27 files changed, 11985 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/43b843aa/bin/kylin.sh
----------------------------------------------------------------------