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:22:16 UTC

[22/31] 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/1c67f4be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1c67f4be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1c67f4be

Branch: refs/heads/master
Commit: 1c67f4be34a24881e9634d65a4dbf90d74c21b46
Parents: 6b45f43 361c227
Author: Shao Feng, Shi <sh...@hotmail.com>
Authored: Wed Feb 4 11:00:07 2015 +0800
Committer: Shao Feng, Shi <sh...@hotmail.com>
Committed: Wed Feb 4 11:00:07 2015 +0800

----------------------------------------------------------------------
 .../common/util/HBaseMetadataTestCase.java      |   16 +-
 docs/website/.gitignore                         |    4 +
 .../_base.scssc                                 |  Bin 33622 -> 0 bytes
 .../_layout.scssc                               |  Bin 42995 -> 0 bytes
 .../_syntax-highlighting.scssc                  |  Bin 40029 -> 0 bytes
 docs/website/_includes/footer.html              |    5 +-
 .../_posts/2015-01-25-introduce-data-model.md   |   40 +
 docs/website/_site/BingSiteAuth.xml             |    4 -
 docs/website/_site/CNAME                        |    1 -
 docs/website/_site/LICENSE                      |  202 -
 docs/website/_site/README.md                    |    2 -
 docs/website/_site/about/index.html             |  229 -
 docs/website/_site/assets/css/animate.css       | 2744 ----------
 docs/website/_site/assets/css/bootstrap.min.css | 5083 ------------------
 .../_site/assets/css/font-awesome.min.css       |    4 -
 docs/website/_site/assets/css/styles.css        |  643 ---
 docs/website/_site/assets/fonts/FontAwesome.otf |  Bin 85908 -> 0 bytes
 .../_site/assets/fonts/fontawesome-webfont.eot  |  Bin 56006 -> 0 bytes
 .../_site/assets/fonts/fontawesome-webfont.svg  |  520 --
 .../_site/assets/fonts/fontawesome-webfont.ttf  |  Bin 112160 -> 0 bytes
 .../_site/assets/fonts/fontawesome-webfont.woff |  Bin 65452 -> 0 bytes
 .../assets/fonts/helveticaneue-webfont.css      |    8 -
 .../assets/fonts/helveticaneue-webfont.eot      |  Bin 50668 -> 0 bytes
 .../assets/fonts/helveticaneue-webfont.svg      |  693 ---
 .../assets/fonts/helveticaneue-webfont.ttf      |  Bin 50456 -> 0 bytes
 .../assets/fonts/helveticaneue-webfont.woff     |  Bin 26140 -> 0 bytes
 .../_site/assets/fonts/helveticaneue_lt.css     |    8 -
 .../_site/assets/fonts/helveticaneue_lt.eot     |  Bin 35346 -> 0 bytes
 .../_site/assets/fonts/helveticaneue_lt.svg     |  573 --
 .../_site/assets/fonts/helveticaneue_lt.ttf     |  Bin 35092 -> 0 bytes
 .../_site/assets/fonts/helveticaneue_lt.woff    |  Bin 18208 -> 0 bytes
 .../assets/fonts/opensans-light-webfont.eot     |  Bin 20556 -> 0 bytes
 .../assets/fonts/opensans-light-webfont.svg     | 1824 -------
 .../assets/fonts/opensans-light-webfont.ttf     |  Bin 44484 -> 0 bytes
 .../assets/fonts/opensans-light-webfont.woff    |  Bin 24100 -> 0 bytes
 .../assets/fonts/opensans-regular-webfont.eot   |  Bin 21103 -> 0 bytes
 .../assets/fonts/opensans-regular-webfont.svg   | 1824 -------
 .../assets/fonts/opensans-regular-webfont.ttf   |  Bin 45112 -> 0 bytes
 .../assets/fonts/opensans-regular-webfont.woff  |  Bin 24736 -> 0 bytes
 docs/website/_site/assets/images/core.png       |  Bin 70377 -> 0 bytes
 docs/website/_site/assets/images/data.png       |  Bin 913990 -> 0 bytes
 .../_site/assets/images/kylin_diagram.png       |  Bin 441427 -> 0 bytes
 docs/website/_site/assets/images/kylin_logo.jpg |  Bin 120174 -> 0 bytes
 docs/website/_site/assets/js/bootstrap.min.js   |    6 -
 .../website/_site/assets/js/jquery-1.9.1.min.js |    5 -
 docs/website/_site/assets/js/main.js            |   78 -
 docs/website/_site/blog/index.html              |  165 -
 docs/website/_site/cn/index.html                |  239 -
 docs/website/_site/community/index.html         |  183 -
 docs/website/_site/css/main.css                 |  449 --
 docs/website/_site/docs/index.html              |  215 -
 .../_site/docs/installation-content/index.html  |  140 -
 .../website/_site/docs/intro-content/index.html |  178 -
 docs/website/_site/fav.png                      |  Bin 9450 -> 0 bytes
 docs/website/_site/favicon.ico                  |  Bin 1150 -> 0 bytes
 docs/website/_site/feed.xml                     |   61 -
 docs/website/_site/google0f781a4ad9402c21.html  |    1 -
 docs/website/_site/index.html                   |  239 -
 docs/website/about/index.md                     |   77 +-
 docs/website/community/index.html               |    8 +-
 docs/website/index.cn.md                        |   27 +-
 docs/website/index.md                           |   27 +-
 .../sandbox/capacity-scheduler.xml              |  210 +-
 examples/test_case_data/sandbox/core-site.xml   |  245 +-
 .../test_case_data/sandbox/hadoop-policy.xml    |  278 +-
 .../test_case_data/sandbox/hbase-policy.xml     |   19 +
 examples/test_case_data/sandbox/hbase-site.xml  |  373 +-
 examples/test_case_data/sandbox/hdfs-site.xml   |  440 +-
 examples/test_case_data/sandbox/hive-site.xml   |  794 +++
 examples/test_case_data/sandbox/httpfs-site.xml |   17 -
 .../test_case_data/sandbox/kylin.properties     |    2 +-
 examples/test_case_data/sandbox/mapred-site.xml |  394 +-
 examples/test_case_data/sandbox/yarn-site.xml   |  656 ++-
 .../main/java/com/kylinolap/jdbc/Driver.java    |    4 +-
 .../kylinolap/job/BuildCubeWithEngineTest.java  |    1 +
 .../java/com/kylinolap/rest/DebugTomcat.java    |    2 +
 76 files changed, 2409 insertions(+), 17551 deletions(-)
----------------------------------------------------------------------