You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/09/07 10:24:19 UTC
[1/2] incubator-kylin git commit: update website links and content
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging fa925f70c -> b60823b23
update website links and content
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/4c15ee6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/4c15ee6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/4c15ee6e
Branch: refs/heads/0.7-staging
Commit: 4c15ee6e14a7842a6d6d2218f7e500bdc3bccbcd
Parents: 60a95f3
Author: Luke Han <lu...@apache.org>
Authored: Mon Sep 7 16:23:34 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Mon Sep 7 16:23:34 2015 +0800
----------------------------------------------------------------------
website/_docs/index.cn.md | 3 ++-
website/_docs/index.md | 4 ++--
website/download/index.cn.md | 2 +-
website/download/index.md | 2 +-
website/index.cn.md | 2 +-
website/index.md | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4c15ee6e/website/_docs/index.cn.md
----------------------------------------------------------------------
diff --git a/website/_docs/index.cn.md b/website/_docs/index.cn.md
index 3e682a6..4958cb9 100644
--- a/website/_docs/index.cn.md
+++ b/website/_docs/index.cn.md
@@ -9,7 +9,7 @@ permalink: /cn/docs/index.html
------------
> Extreme OLAP Engine for Big Data
-Apache Kylin 是由eBay开源的分布式分析引擎，提供Hadoop之上的SQL查询接口及多维分析（OLAP）能力以支持超大规模数据。
+Apache Kylin一个开源的分布式分析引擎，提供Hadoop之上的SQL查询接口及多维分析（OLAP）能力以支持超大规模数据，最初由eBay Inc.开发并贡献至开源社区。
安装
------------
@@ -19,3 +19,4 @@ Apache Kylin 是由eBay开源的分布式分析引擎，提供Hadoop之上的SQL
+
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4c15ee6e/website/_docs/index.md
----------------------------------------------------------------------
diff --git a/website/_docs/index.md b/website/_docs/index.md
index 0c62b63..64e1295 100644
--- a/website/_docs/index.md
+++ b/website/_docs/index.md
@@ -9,7 +9,7 @@ Welcome to Apache Kylin
------------
> Extreme OLAP Engine for Big Data
-Apache Kylin is an open source Distributed Analytics Engine, contributed by eBay Inc., provides SQL interface and multi-dimensional analysis (OLAP) on Hadoop supporting extremely large datasets.
+Apache Kylin is an open source Distributed Analytics Engine designed to provide SQL interface and multi-dimensional analysis (OLAP) on Hadoop supporting extremely large datasets, original contributed from eBay Inc.
Installation & Setup
------------
@@ -51,6 +51,6 @@ Advanced Topics
1.[New meta data model structure](/development/new_metadata.html)
----
+
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4c15ee6e/website/download/index.cn.md
----------------------------------------------------------------------
diff --git a/website/download/index.cn.md b/website/download/index.cn.md
index e372fdc..5bba309 100644
--- a/website/download/index.cn.md
+++ b/website/download/index.cn.md
@@ -3,7 +3,7 @@ layout: download-cn
title: 下载
---
-__最新发布 (源代码)__
+__最新发布(源代码)__
最新发布的Apache Kylin可以从ASF网站下载：:
* [Apache Kylin v1.0-incubating](http://www.apache.org/dyn/closer.cgi/incubator/kylin/apache-kylin-1.0-incubating/)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4c15ee6e/website/download/index.md
----------------------------------------------------------------------
diff --git a/website/download/index.md b/website/download/index.md
index e7db862..e757d65 100644
--- a/website/download/index.md
+++ b/website/download/index.md
@@ -4,7 +4,7 @@ title: Download
permalink: /download/index.html
---
-__Latest Release (Source Code)__
+__Latest Release(Source Code)__
The latest release of Apache Kylin can be downloaded from the ASF:
* [Apache Kylin v1.0-incubating](http://www.apache.org/dyn/closer.cgi/incubator/kylin/apache-kylin-1.0-incubating/)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4c15ee6e/website/index.cn.md
----------------------------------------------------------------------
diff --git a/website/index.cn.md b/website/index.cn.md
index e840db9..08e35ca 100644
--- a/website/index.cn.md
+++ b/website/index.cn.md
@@ -13,7 +13,7 @@ title: 首页
<h4 class="section-title"><span>Apache Kylin 概览</span></h4>
<div class="row" style="margin-top:-20px;">
<div class="col-sm-12 col-md-12">
- <p class="title_text"> Kylin 于2014年11月25日被接受会Apache孵化器项目</p>
+ <p class="title_text"> Apache Kylin 于2014年11月25日被接受会Apache孵化器项目</p>
<p class="title_text"> Apache Kylin一个开源的分布式分析引擎，提供Hadoop之上的SQL查询接口及多维分析（OLAP）能力以支持超大规模数据，最初由eBay Inc. 开发并贡献至开源社区。</p>
<img id="diagram" src="{{ "/assets/images/kylin_diagram.png"| prepend: site.baseurl }}"> </div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4c15ee6e/website/index.md
----------------------------------------------------------------------
diff --git a/website/index.md b/website/index.md
index 8efac9a..f8bdbe3 100644
--- a/website/index.md
+++ b/website/index.md
@@ -13,7 +13,7 @@ title: Home
<h4 class="section-title"><span>Apache Kylin Overview</span></h4>
<div class="row" style="margin-top:-20px;">
<div class="col-sm-12 col-md-12">
- <p class="title_text"> Kylin has been accepted as Apache Incubator Project on Nov 25, 2014.</p>
+ <p class="title_text"> Apache Kylin has been accepted as Apache Incubator Project on Nov 25, 2014.</p>
<p class="title_text"> Apache Kylin is an open source Distributed Analytics Engine designed to provide SQL interface and multi-dimensional analysis (OLAP) on Hadoop supporting extremely large datasets, original contributed from eBay Inc.</p>
<img id="diagram" src="assets/images/kylin_diagram.png"> </div>
</div>
[2/2] incubator-kylin git commit: Merge branch '0.7-staging' of
https://git-wip-us.apache.org/repos/asf/incubator-kylin into 0.7-staging
Posted by lu...@apache.org.
Merge branch '0.7-staging' of https://git-wip-us.apache.org/repos/asf/incubator-kylin into 0.7-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/b60823b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b60823b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b60823b2
Branch: refs/heads/0.7-staging
Commit: b60823b23a97c9a02b1da449032a5f9460eaaca6
Parents: 4c15ee6 fa925f7
Author: Luke Han <lu...@apache.org>
Authored: Mon Sep 7 16:23:55 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Mon Sep 7 16:23:55 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/common/KylinConfig.java | 52 ++++++++++++--------
conf/kylin.properties | 16 +++---
.../test_case_data/sandbox/kylin.properties | 16 +++---
.../kylin/job/constant/BatchConstants.java | 2 +
.../hadoop/cube/RangeKeyDistributionJob.java | 10 ++--
.../cube/RangeKeyDistributionReducer.java | 13 +++--
6 files changed, 67 insertions(+), 42 deletions(-)
----------------------------------------------------------------------