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/06/11 08:37:30 UTC
[06/14] incubator-kylin git commit: Merge branch '0.7-staging' of
https://git-wip-us.apache.org/repos/asf/incubator-kylin into 0.7.1-staging
Merge branch '0.7-staging' of https://git-wip-us.apache.org/repos/asf/incubator-kylin into 0.7.1-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/b32f9b30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b32f9b30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b32f9b30
Branch: refs/heads/0.7
Commit: b32f9b3012d58fb9db27f840ee459b968493054e
Parents: f782391 b3b0f2f
Author: shaofengshi <sh...@apache.org>
Authored: Tue Jun 9 14:20:35 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Jun 9 14:20:35 2015 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 2 +-
bin/find-hbase-dependency.sh | 18 +
common/pom.xml | 2 +-
cube/pom.xml | 2 +-
dictionary/pom.xml | 2 +-
.../apache/kylin/dict/TrieDictionaryTest.java | 2 +-
.../english-words.80 (scowl-2015.05.18).dic | 139304 ++++++++++++++++
.../english-words.80 (scowl-2015.05.18).txt | 139304 ----------------
invertedindex/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
.../org/apache/kylin/jdbc/util/SQLTypeMap.java | 366 +-
job/pom.xml | 2 +-
metadata/pom.xml | 2 +-
pom.xml | 9 +-
query/pom.xml | 2 +-
server/pom.xml | 2 +-
.../kylin/rest/controller/CubeController.java | 2 +
.../kylin/rest/response/HBaseResponse.java | 26 +
src/main/config/assemblies/source-assembly.xml | 3 +
storage/pom.xml | 2 +-
webapp/app/index.html | 1 -
webapp/app/js/controllers/cubeSchema.js | 2 +-
webapp/app/js/controllers/index.js | 44 -
webapp/app/less/app.less | 2 +-
webapp/app/less/layout.less | 5 +
webapp/app/partials/cubes/cube_detail.html | 2 +
webapp/app/partials/header.html | 2 +-
webapp/app/partials/home.html | 65 -
webapp/app/partials/query/query_detail.html | 5 +-
webapp/app/routes.json | 9 +-
webapp/bower.json | 2 +-
31 files changed, 139568 insertions(+), 139627 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b32f9b30/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
----------------------------------------------------------------------