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:23:39 UTC

[79/97] [abbrv] incubator-kylin git commit: Merge branch 'staging' of https://github.com/KylinOLAP/Kylin into staging

Merge branch 'staging' of https://github.com/KylinOLAP/Kylin into 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/361c227a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/361c227a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/361c227a

Branch: refs/heads/staging
Commit: 361c227ad9b34a25e6c99d131e979a99d139f2a2
Parents: a9a0118 7d48115
Author: Shao Feng, Shi <sh...@hotmail.com>
Authored: Wed Feb 4 09:56:56 2015 +0800
Committer: Shao Feng, Shi <sh...@hotmail.com>
Committed: Wed Feb 4 09:56:56 2015 +0800

----------------------------------------------------------------------
 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             |  232 -
 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 -
 .../2015/01/26/introduce-data-model/index.html  |  184 -
 docs/website/_site/blog/index.html              |  168 -
 docs/website/_site/cn/index.html                |  217 -
 docs/website/_site/community/index.html         |  190 -
 docs/website/_site/css/main.css                 |  449 --
 docs/website/_site/docs/index.html              |  218 -
 .../_site/docs/installation-content/index.html  |  143 -
 .../website/_site/docs/intro-content/index.html |  181 -
 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                   |  217 -
 docs/website/about/index.md                     |   77 +-
 53 files changed, 3 insertions(+), 16557 deletions(-)
----------------------------------------------------------------------