svn commit: r1734389 - in /kylin/site: development/howto_contribute.html feed.xml

[li...@apache.org]

Author: lidong
Date: Thu Mar 10 12:02:32 2016
New Revision: 1734389

URL: http://svn.apache.org/viewvc?rev=1734389&view=rev
Log:
branch info update

Modified:
    kylin/site/development/howto_contribute.html
    kylin/site/feed.xml

Modified: kylin/site/development/howto_contribute.html
URL: http://svn.apache.org/viewvc/kylin/site/development/howto_contribute.html?rev=1734389&r1=1734388&r2=1734389&view=diff
==============================================================================
--- kylin/site/development/howto_contribute.html (original)
+++ kylin/site/development/howto_contribute.html Thu Mar 10 12:02:32 2016
@@ -476,9 +476,9 @@
 							<article class="post-content" >
 							<h2 id="current-branches">Current branches</h2>
 <ul>
-  <li><code class="highlighter-rouge">1.x-staging</code>: Dev branch for 1,x versions, this branch spawns releases like 1.0, 1.1 etc. This is where new patches go to.</li>
-  <li><code class="highlighter-rouge">2.x-staging</code>: Dev branch for 2.x versions, 2.x is the next generation Kylin (with streaming, spark support), it has fundamental difference with 1.x version, which means any changes on 1.x cannot merge to 2.x anymore. So if your patch affects both branches, you should make patches for both branches.</li>
-  <li><code class="highlighter-rouge">master</code>: always point to the latest stable release (stable, but not up to date)</li>
+  <li><code class="highlighter-rouge">master</code>: Main development branch for new features</li>
+  <li><code class="highlighter-rouge">1.3.x</code>: Maintenance branch for a certain release</li>
+  <li><code class="highlighter-rouge">document</code>: Document branch</li>
 </ul>
 
 <h2 id="making-changes">Making Changes</h2>

Modified: kylin/site/feed.xml
URL: http://svn.apache.org/viewvc/kylin/site/feed.xml?rev=1734389&r1=1734388&r2=1734389&view=diff
==============================================================================
--- kylin/site/feed.xml (original)
+++ kylin/site/feed.xml Thu Mar 10 12:02:32 2016
@@ -19,8 +19,8 @@
     <description>Apache Kylin Home</description>
     <link>http://kylin.apache.org/</link>
     <atom:link href="http://kylin.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Thu, 10 Mar 2016 06:01:40 -0800</pubDate>
-    <lastBuildDate>Thu, 10 Mar 2016 06:01:40 -0800</lastBuildDate>
+    <pubDate>Thu, 10 Mar 2016 12:01:13 -0800</pubDate>
+    <lastBuildDate>Thu, 10 Mar 2016 12:01:13 -0800</lastBuildDate>
     <generator>Jekyll v2.5.3</generator>
     
       <item>