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

[li...@apache.org]

Author: lidong
Date: Wed Nov 29 09:26:17 2017
New Revision: 1816611

URL: http://svn.apache.org/viewvc?rev=1816611&view=rev
Log:
KYLIN-1044 Update the how to contribute page to allow Github pull requests

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=1816611&r1=1816610&r2=1816611&view=diff
==============================================================================
--- kylin/site/development/howto_contribute.html (original)
+++ kylin/site/development/howto_contribute.html Wed Nov 29 09:26:17 2017
@@ -628,10 +628,12 @@
 <h2 id="apply-patch">Apply Patch</h2>
 <ul>
   <li>Committer will review Pull Requests and Patches in JIRA regarding correctness, performance, design, coding style, test coverage</li>
-  <li>Discuss and revise if necessary</li>
+  <li>Discuss and revise if necessary;</li>
   <li>Finally committer merge code into target branch
     <ul>
-      <li>We use <code class="highlighter-rouge">git rebase</code> to ensure the merged result is a streamline of commits.</li>
+      <li>For a git patch, use “git am -s -3 patch-file” command to apply;</li>
+      <li>If it is from a github Pull Request, need add “This closes #<pr number="">" as part of the commit messages. This will allow ASF Git bot to close the PR.</pr></li>
+      <li>Use <code class="highlighter-rouge">git rebase</code> to ensure the merged result is a streamline of commits.</li>
     </ul>
   </li>
 </ul>

Modified: kylin/site/feed.xml
URL: http://svn.apache.org/viewvc/kylin/site/feed.xml?rev=1816611&r1=1816610&r2=1816611&view=diff
==============================================================================
--- kylin/site/feed.xml (original)
+++ kylin/site/feed.xml Wed Nov 29 09:26:17 2017
@@ -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>Mon, 27 Nov 2017 05:59:29 -0800</pubDate>
-    <lastBuildDate>Mon, 27 Nov 2017 05:59:29 -0800</lastBuildDate>
+    <pubDate>Wed, 29 Nov 2017 01:24:27 -0800</pubDate>
+    <lastBuildDate>Wed, 29 Nov 2017 01:24:27 -0800</lastBuildDate>
     <generator>Jekyll v2.5.3</generator>
     
       <item>