kylin git commit: KYLIN-1301 fix IT

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/2.0-rc 28b2154fd -> 3904a1767


KYLIN-1301 fix IT


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

Branch: refs/heads/2.0-rc
Commit: 3904a17671ba150728f9dbc40d1504d76401f9e6
Parents: 28b2154
Author: honma 
Authored: Mon Jan 11 16:57:52 2016 +0800
Committer: honma 
Committed: Mon Jan 11 16:57:52 2016 +0800

--
 query/src/test/resources/query/sql/query96.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/3904a176/query/src/test/resources/query/sql/query96.sql
--
diff --git a/query/src/test/resources/query/sql/query96.sql 
b/query/src/test/resources/query/sql/query96.sql
index a1eda6f..c9c0c6f 100644
--- a/query/src/test/resources/query/sql/query96.sql
+++ b/query/src/test/resources/query/sql/query96.sql
@@ -24,5 +24,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND 
test_kylin_fact.lstg_site_id = test_category_groupings.site_id
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
- where test_kylin_fact.lstg_format_name='XXXUnknownFP-GTC' 
+ where test_kylin_fact.lstg_format_name='XXXUnknown' 
  group by test_cal_dt.cal_dt 

svn commit: r1723987 - in /kylin/site: ./ development/ docs/ docs/howto/ docs/install/

[lidong]

Author: lidong
Date: Mon Jan 11 08:25:54 2016
New Revision: 1723987

URL: http://svn.apache.org/viewvc?rev=1723987=rev
Log:
Update documents on rest APIs and devs

Modified:
kylin/site/development/dev_env.html
kylin/site/development/howto_contribute.html
kylin/site/development/howto_docs.html
kylin/site/docs/howto/howto_build_cube_with_restapi.html
kylin/site/docs/howto/howto_jdbc.html
kylin/site/docs/howto/howto_use_restapi.html
kylin/site/docs/howto/howto_use_restapi_in_js.html
kylin/site/docs/index.html
kylin/site/docs/install/hadoop_env.html
kylin/site/feed.xml

Modified: kylin/site/development/dev_env.html
URL: 
http://svn.apache.org/viewvc/kylin/site/development/dev_env.html?rev=1723987=1723986=1723987=diff
==
--- kylin/site/development/dev_env.html (original)
+++ kylin/site/development/dev_env.html Mon Jan 11 08:25:54 2016
@@ -454,7 +454,8 @@
 ambari-agent start
 ambari-server start
 
-With both command successfully run you can go to ambari home page at http://yoursandboxip:8080;>http://yoursandboxip:8080 
(user:admin,password:admin) to check everything’s status. By default ambari 
disables Hbase, you’ll need manually start the Hbase service.
+With both command successfully run you can go to ambari home page at http://yoursandboxip:8080;>http://yoursandboxip:8080 
(user:admin,password:admin) to check everything’s status. By default ambari 
disables Hbase, you’ll need manually start the Hbase service.
+https://raw.githubusercontent.com/KylinOLAP/kylinolap.github.io/master/docs/installation/starthbase.png;
 alt="start hbase in ambari" />
 
 For other hadoop distribution, basically start the hadoop cluster, make 
sure HDFS, YARN, Hive, HBase are running.
 

Modified: kylin/site/development/howto_contribute.html
URL: 
http://svn.apache.org/viewvc/kylin/site/development/howto_contribute.html?rev=1723987=1723986=1723987=diff
==
--- kylin/site/development/howto_contribute.html (original)
+++ kylin/site/development/howto_contribute.html Mon Jan 11 08:25:54 2016
@@ -453,7 +453,11 @@
 
   Raise an issue on JIRA, describe the feature/enhancement/bug
   Discuss with others in mailing list or issue comments, make sure the 
proposed changes fit in with what others are doing and have planned for the 
project
-  Make changes in your fork
+  Make changes in your fork
+
+  No strict code style at the moment, but the general rule is keep 
consistent with existing files. E.g. use 4-space indent for java files.
+
+  
   Write unit test if no existing cover your change
   Generate patch and attach it to relative JIRA; Please use git format-patch command to generate the 
patch, for a detail guide you can refer to https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/;>How
 to create and apply a patch with Git
 

Modified: kylin/site/development/howto_docs.html
URL: 
http://svn.apache.org/viewvc/kylin/site/development/howto_docs.html?rev=1723987=1723986=1723987=diff
==
--- kylin/site/development/howto_docs.html (original)
+++ kylin/site/development/howto_docs.html Mon Jan 11 08:25:54 2016
@@ -441,13 +441,24 @@

Before your work
 
-Install following tools before you add or edit documentation:  
-1. First, make sure Ruby and Gem are works on your machine  
-For Mac User, please refer https://github.com/sstephenson/rbenv#homebrew-on-mac-os-x;>this to 
setup ruby env.  
-2. Then, install http://jekyllrb.com;>Jekyll, and plugins, for 
example:  
-gem install jekyll jekyll-multiple-languages 
kramdown rouge  
-3. http://jekyll-langs.liaohuqiu.net/cn/;>Jekyll Multiple Languages 
Plugin  
-4. And any markdown editor
+Install following tools before you add or edit documentation:
+
+
+  First, make sure Ruby and Gem work on your machine
+
+  For Mac user, please refer https://github.com/sstephenson/rbenv#homebrew-on-mac-os-x;>this to 
setup ruby env.
+  For Windows user, use the http://rubyinstaller.org/downloads/;>ruby installer.
+  For China user, consider use a https://ruby.taobao.org/;>local gem repository in case of network 
issues.
+
+  
+  Then, install http://jekyllrb.com;>Jekyll, and required 
plugins
+
+  gem install jekyll 
jekyll-multiple-languages kramdown rouge
+  Note: Some specific version of jekyll and 
jekyll-multiple-languages does not work together (I got a “undefined 
method” error with jekyll 3.0.1 and jekyll-multiple-languages 2.0.3). In that 
case, jekyll 2.5.3 and jekyll-multiple-languages 1.0.8 is the known 
working version.
+
+  
+  And optionally any markdown editor you prefer
+
 
 About Jekyll
 Jekyll is a Ruby script to generate a static HTML website 

[kylin] Git Push Summary

[wangxiaoyu]

Repository: kylin
Updated Branches:
  refs/heads/KYLIN-1122 [created] 5db430706