Author: buildbot
Date: Tue Apr 1 01:19:26 2014
New Revision: 904465
Log:
Staging update by buildbot for thrift
Added:
websites/staging/thrift/trunk/content/docs/committers/HowToCommit.html
Modified:
websites/staging/thrift/trunk/content/ (props changed)
websites/staging/thrift/trunk/content/about.html
websites/staging/thrift/trunk/content/docs/HowToContribute.html
websites/staging/thrift/trunk/content/docs/committers/index.html
websites/staging/thrift/trunk/content/sitemap.html
Propchange: websites/staging/thrift/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Apr 1 01:19:26 2014
@@ -1 +1 @@
-1583103
+1583503
Modified: websites/staging/thrift/trunk/content/about.html
==============================================================================
--- websites/staging/thrift/trunk/content/about.html (original)
+++ websites/staging/thrift/trunk/content/about.html Tue Apr 1 01:19:26 2014
@@ -309,13 +309,6 @@
</tbody>
</table>
</div>
-
-<hr />
-<h3 id="testimonials">Testimonials</h3>
-<blockquote>
-<p>As I have said to a number of people, Thrift is the Swiss Army Knife of
software.</p>
-</blockquote>
-<p><a
href="http://mail-archives.apache.org/mod_mbox/thrift-user/201401.mbox/%[email protected]%3e";>Rush
Manbert</a></p>
</div>
<div class="container">
<hr>
Modified: websites/staging/thrift/trunk/content/docs/HowToContribute.html
==============================================================================
--- websites/staging/thrift/trunk/content/docs/HowToContribute.html (original)
+++ websites/staging/thrift/trunk/content/docs/HowToContribute.html Tue Apr 1
01:19:26 2014
@@ -73,21 +73,55 @@
<h2 id="how-to-contribute">How to contribute</h2>
<ol>
<li>Make sure your issue is not all ready in the <a
href="http://issues.apache.org/jira/browse/THRIFT";>Jira issue tracker</a></li>
-<li>If not, create a ticket describing the change you're proposing in the
issue tracker</li>
-<li>Check out the latest version of the source code</li>
-<li>git clone https://git-wip-us.apache.org/repos/asf/thrift.git thrift</li>
-<li>Modify the source to include the improvement/bugfix</li>
+<li>If not, create a ticket describing the change you're proposing in the <a
href="http://issues.apache.org/jira/browse/THRIFT";>Jira issue tracker</a></li>
+<li>Contribute your patch using one of the two methods below</li>
+</ol>
+<h3 id="contributing-via-a-patch">Contributing via a patch</h3>
+<ol>
+<li>
+<p>Check out the latest version of the source code</p>
+<ul>
+<li>git clone https://git-wip-us.apache.org/repos/asf/thrift.git thrift </li>
+</ul>
+</li>
+<li>
+<p>Modify the source to include the improvement/bugfix</p>
+<ul>
<li>Verify that you follow the same CodingStyle you see within the language
you are working on</li>
<li>Verify that your change works by adding a unit test.</li>
-<li>Create a patch from project root directory (e.g. you@dev:~/thrift $ ):</li>
+</ul>
+</li>
+<li>
+<p>Create a patch from project root directory (e.g. you@dev:~/thrift $ ):</p>
+<ul>
<li>git diff > ../thrift-XXX-my-new-feature.patch</li>
-<li>Attach the newly generated patch to the issue </li>
-<li>Wait for other developers or committers to review it and hopefully +1 the
ticket</li>
-<li>Wait for a committer to commit it.</li>
+</ul>
+</li>
+<li>
+<p>Attach the newly generated patch to the issue</p>
+</li>
+<li>Wait for other contributors or committers to review your new addition</li>
+<li>Wait for a committer to commit your patch</li>
+</ol>
+<h3 id="contributing-via-github-pull-requests">Contributing via GitHub pull
requests</h3>
+<ol>
+<li>Create a fork for http://github.com/apache/thrift</li>
+<li>Create a branch with the jira ticket number you are working on</li>
+<li>
+<p>Modify the source to include the improvement/bugfix</p>
+<ul>
+<li>Verify that you follow the same CodingStyle you see within the language
you are working on</li>
+<li>Verify that your change works by adding a unit test. </li>
+</ul>
+</li>
+<li>
+<p>Issue a pull request for your new feature</p>
+</li>
+<li>Wait for other contributors or committers to review your new addition</li>
+<li>Wait for a committer to commit your patch</li>
</ol>
<h3 id="more-info">More info</h3>
-<p>Plenty of information on why and how to contribute is available on the
Apache Software Foundation (ASF) web site.
- In particular, we recommend the following:</p>
+<p>Plenty of information on why and how to contribute is available on the
Apache Software Foundation (ASF) web site. In particular, we recommend the
following:</p>
<ul>
<li><a href="http://www.apache.org/dev/contributors";>Contributors Tech
Guide</a></li>
<li><a href="http://www.apache.org/foundation/getinvolved.html";>Get
involved!</a></li>
Added: websites/staging/thrift/trunk/content/docs/committers/HowToCommit.html
==============================================================================
--- websites/staging/thrift/trunk/content/docs/committers/HowToCommit.html
(added)
+++ websites/staging/thrift/trunk/content/docs/committers/HowToCommit.html Tue
Apr 1 01:19:26 2014
@@ -0,0 +1,186 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+ <head>
+ <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+ <meta content="en-us" http-equiv="Content-Language" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <link href="/static/images/favicon.ico" rel="shortcut icon" />
+ <link href="/static/css/style.css" rel="stylesheet" type="text/css" />
+ <link href="/static/css/codehilite.css" rel="stylesheet" type="text/css" />
+ <link href="/static/css/bootstrap.css" media="screen, projection"
rel="stylesheet" type="text/css" />
+
+ <script src="/static/js/jquery.min.js"></script>
+ <script src="/static/js/bootstrap-dropdown.js"></script>
+ <script src="/static/js/bootstrap-tab.js"></script>
+
+ <title>Apache Thrift - How To Commit</title>
+ </head>
+ <body>
+ <div class="navbar">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="brand" href="/">Apache Thrift ™</a>
+ <div class="nav-collapse">
+ <ul class="nav pull-right">
+ <li>
+ <a href="/download">Download</a>
+ </li>
+ <li>
+ <a
href="/docs">Documentation</a>
+ </li>
+ <li>
+ <a
href="/developers">Developers</a>
+ </li>
+ <li>
+ <a
href="/tutorial">Tutorials</a>
+ </li>
+ <li>
+ <a href="/test">Test Suite</a>
+ </li>
+ <li>
+ <a href="/about">About</a>
+ </li>
+ <li class="dropdown">
+ <a href="#"
class="dropdown-toggle" data-toggle="dropdown">
+ Apache <b
class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ <li>
+ <a
href="http://www.apache.org/"; target="_blank">Apache Home</a>
+ </li>
+ <li>
+ <a
href="http://www.apache.org/licenses/"; target="_blank">Apache License v2.0</a>
+ </li>
+ <li>
+ <a
href="http://www.apache.org/foundation/sponsorship.html";
target="_blank">Donate</a>
+ </li>
+ <li>
+ <a
href="http://www.apache.org/foundation/thanks.html"; target="_blank">Thanks</a>
+ </li>
+ <li>
+ <a
href="http://www.apache.org/security/"; target="_blank">Security</a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>
+
+ <div class="container">
+ <h2 id="how-to-commit">How to Commit</h2>
+<ol>
+<li>
+<p>Make sure that there is an issue for the patch(s) you are about to commit
in our <a href="http://issues.apache.org/jira/browse/THRIFT";>Jira issue
tracker</a></p>
+</li>
+<li>
+<p>Check out the latest version of the source code</p>
+<ul>
+<li>git clone https://git-wip-us.apache.org/repos/asf/thrift.git thrift </li>
+</ul>
+</li>
+<li>
+<p>Apply the patch</p>
+<ul>
+<li>curl https://issues.apache.org/jira/... |git apply
--ignore-space-change</li>
+</ul>
+<p>or</p>
+<ul>
+<li>curl https://github.com/<GitHub User>/thrift/commit/<Commit ID>.patch |git
apply --ignore-space-change</li>
+</ul>
+</li>
+<li>
+<p>Inspect the applied patch to ensure that all <a
href="http://www.apache.org/licenses/LICENSE-2.0.html#contributions";>Legal
aspects on Submission of Contributions (Patches)</a> are met</p>
+</li>
+<li>
+<p>Run the necessary unit tests and cross language test cases to verify the
patch</p>
+</li>
+<li>
+<p>Commit the patch</p>
+<div class="codehilite"><pre><span class="n">git</span> <span
class="o">--</span><span class="n">config</span> <span
class="n">user</span><span class="p">.</span><span class="n">name</span>
"<span class="n">Your</span> <span class="n">Name</span>"
+<span class="n">git</span> <span class="o">--</span><span
class="n">config</span> <span class="n">user</span><span
class="p">.</span><span class="n">email</span> "<span
class="n">YourApacheID</span><span class="p">@</span><span
class="n">apache</span><span class="p">.</span><span class="n">org</span>"
+<span class="n">git</span> <span class="n">add</span> <span
class="o">-</span><span class="n">A</span>
+<span class="n">git</span> <span class="n">commit</span>
+</pre></div>
+
+
+</li>
+<li>
+<p>The commit message should be in the format:</p>
+<div class="codehilite"><pre><span class="x">THRIFT-###:<Jira
description></span>
+<span class="x">Client: <component></span>
+<span class="x">Patch: <Name of person contributing the patch></span>
+
+<span class="x">Description of what was fixed or addressed.</span>
+
+<span class="cp"><%</span>
+ <span class="k">if</span> <span class="n">this</span> <span
class="n">is</span> <span class="n">a</span> <span class="n">github</span>
<span class="n">pull</span> <span class="n">request</span> <span
class="k">then</span> <span class="n">copy</span> <span class="n">the</span>
<span class="n">below</span> <span class="n">block</span>
+ <span class="n">from</span> <span class="n">the</span> <span
class="no">GitHub</span> <span class="n">email</span> <span
class="n">that</span> <span class="n">came</span> <span class="n">to</span>
<span class="n">dev</span><span class="err">@</span> <span
class="n">list</span><span class="p">,</span> <span class="n">this</span> <span
class="n">will</span>
+ <span class="n">automatically</span> <span class="n">close</span> <span
class="n">the</span> <span class="no">GitHub</span> <span class="n">pull</span>
<span class="n">request</span>
+<span class="cp">%></span><span class="x"></span>
+<span class="x">Github Pull Request: This closes #XX</span>
+<span class="x">----</span>
+<span class="x">commit 1234567</span>
+<span class="x">Author: docbrown <[email protected]></span>
+<span class="x">Date: 1985-06-03T01:21:00Z</span>
+
+<span class="x"> fix for THRIFT-1234</span>
+
+<span class="x"> fix for THRIFT-1234 fixes the flux capacitor</span>
+</pre></div>
+
+
+</li>
+<li>
+<p>Double check the patch committed and that nothing was missed then push the
patch</p>
+<div class="codehilite"><pre><span class="n">git</span> <span
class="n">status</span>
+<span class="n">git</span> <span class="n">show</span> <span
class="n">HEAD</span>
+<span class="n">git</span> <span class="n">push</span> <span
class="n">origin</span> <span class="n">master</span>
+</pre></div>
+
+
+</li>
+<li>
+<p>Resolve the jira issue and set the following for the changelog</p>
+<ul>
+<li>Component the patch is for </li>
+<li>fixVersion to the current version on master</li>
+</ul>
+</li>
+</ol>
+ </div>
+ <div class="container">
+ <hr>
+ <footer class="footer">
+ <div class="row">
+ <div class="span3">
+ <h3>Links</h3>
+ <ul class="unstyled">
+ <li><a
href="/download">Download</a></li>
+ <li><a
href="/developers">Developers</a></li>
+ <li><a
href="/tutorial">Tutorials</a></li>
+ </ul>
+ <ul class="unstyled">
+ <li><a href="/sitemap">Sitemap</a></li>
+ </ul>
+ </div>
+ <div class="span3">
+ <h3>Get Involved</h3>
+ <ul class="unstyled">
+ <li><a href="/mailing">Mailing
Lists</a></li>
+ <li><a
href="http://issues.apache.org/jira/browse/THRIFT";>Issue Tracking</a></li>
+ <li><a href="/docs/HowToContribute">How
To Contribute</a></li>
+ </ul>
+ </div>
+ <div class="span6">
+ <a href="http://www.apache.org/";><img
src="/static/images/favicon.ico" /></a> Copyright 2014 <a
href="http://www.apache.org/";>Apache Software Foundation</a>. Licensed under
the <a href="http://www.apache.org/licenses/";>Apache License v2.0</a>. Apache,
Apache Thrift, and the Apache feather logo are trademarks of The Apache
Software Foundation.
+ </div>
+ </div>
+
+ </footer>
+</div>
+
+ </body>
+</html>
Modified: websites/staging/thrift/trunk/content/docs/committers/index.html
==============================================================================
--- websites/staging/thrift/trunk/content/docs/committers/index.html (original)
+++ websites/staging/thrift/trunk/content/docs/committers/index.html Tue Apr 1
01:19:26 2014
@@ -72,6 +72,7 @@
<div class="container">
<ul>
<li><a href="/docs/committers/AdditionalReading">General articles and links
for committers</a></li>
+<li><a href="/docs/committers/HowToCommit">How To Commit</a></li>
<li><a href="/docs/committers/HowToPublish">How to publish a release</a></li>
<li><a href="/docs/committers/HowToRelease">How to create a release</a></li>
<li><a href="/docs/committers/HowToThriftWebsite">How to update the
website</a></li>
Modified: websites/staging/thrift/trunk/content/sitemap.html
==============================================================================
--- websites/staging/thrift/trunk/content/sitemap.html (original)
+++ websites/staging/thrift/trunk/content/sitemap.html Tue Apr 1 01:19:26 2014
@@ -79,6 +79,7 @@
<li><a href="/docs/HowToContribute">How To Contribute</a></li>
<li><a href="/docs/committers/">Index of committers/</a><ul>
<li><a href="/docs/committers/AdditionalReading">General articles and links
for committers</a></li>
+<li><a href="/docs/committers/HowToCommit">How To Commit</a></li>
<li><a href="/docs/committers/HowToPublish">How to publish a release</a></li>
<li><a href="/docs/committers/HowToRelease">How to create a release</a></li>
<li><a href="/docs/committers/HowToThriftWebsite">How to update the
website</a></li>
