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/02/12 06:43:06 UTC

[16/50] incubator-kylin git commit: Merge branch 'inverted-index' of https://github.com/KylinOLAP/Kylin into inverted-index

Merge branch 'inverted-index' of https://github.com/KylinOLAP/Kylin into inverted-index


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

Branch: refs/heads/inverted-index
Commit: 91545438a8c86ecb2ad57487ce85c25852149f0a
Parents: a7b4ac8 681314c
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Tue Feb 10 17:39:21 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Tue Feb 10 17:39:21 2015 +0800

----------------------------------------------------------------------
 .gitignore                                      |   2 +-
 bin/check-env.sh                                |  39 +++++
 bin/find-hive-dependency.sh                     |  20 +++
 bin/healthmon.sh                                |  33 ++++
 bin/start-kylin.sh                              |  59 +++++++
 bin/stop-kylin.sh                               |   4 +
 .../org/apache/kylin/common/KylinConfig.java    |   2 -
 conf/kylin.properties                           |   6 +-
 .../test_case_data/localmeta/kylin.properties   |   7 +-
 .../localmeta_v1/kylin.properties               |   7 +-
 .../minicluster/b-kylin/kylin.properties        |   8 +-
 .../minicluster/b-kylin/meta/kylin.properties   |   3 -
 .../test_case_data/minicluster/kylin.properties |   8 +-
 .../sandbox-hdp21/kylin.properties              |   7 +-
 .../sandbox-hdp21/mapred-site.xml               |   2 +-
 .../test_case_data/sandbox/kylin.properties     |   7 +-
 examples/test_case_data/sandbox/mapred-site.xml |   2 +-
 sbin/check-env.sh                               |  39 -----
 sbin/find-hive-dependency.sh                    |  19 --
 sbin/healthmon.sh                               |  33 ----
 sbin/kylin.sh                                   |  35 ----
 sbin/sandbox_deploy.sh                          | 172 -------------------
 sbin/start-kylin-sandbox.sh                     |  50 ------
 sbin/start-kylin.sh                             |  49 ------
 sbin/stop-kylin.sh                              |   4 -
 script/build.sh                                 |  17 ++
 script/compress.sh                              |   2 +-
 script/debug.sh                                 |  31 ----
 script/download-tomcat.sh                       |  20 ++-
 script/install.sh                               |  15 --
 script/package.sh                               |  38 ++--
 script/prepare.sh                               |   6 +
 script/release.sh                               |  33 ----
 server/ServiceConfig.md                         |   2 -
 webapp/CHANGELOG.md                             |   1 -
 webapp/app/js/controllers/page.js               |   1 -
 webapp/app/js/controllers/projects.js           |   3 +-
 webapp/app/js/controllers/sourceMeta.js         |  13 +-
 webapp/app/js/model/projectModel.js             |   2 +
 webapp/app/js/model/tableModel.js               |   7 +-
 webapp/app/partials/cubes/cube_json_edit.html   |   2 +-
 webapp/app/partials/jobs/job_submit.html        |  38 ++--
 webapp/bower.json                               |   5 +-
 43 files changed, 289 insertions(+), 564 deletions(-)
----------------------------------------------------------------------