Author: buildbot
Date: Sat Jun 15 04:22:38 2013
New Revision: 865722
Log:
Staging update by buildbot for libcloud
Modified:
websites/staging/libcloud/trunk/content/ (props changed)
websites/staging/libcloud/trunk/content/contributing.html
Propchange: websites/staging/libcloud/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jun 15 04:22:38 2013
@@ -1 +1 @@
-1493286
+1493306
Modified: websites/staging/libcloud/trunk/content/contributing.html
==============================================================================
--- websites/staging/libcloud/trunk/content/contributing.html (original)
+++ websites/staging/libcloud/trunk/content/contributing.html Sat Jun 15
04:22:38 2013
@@ -102,36 +102,39 @@
<div id="main" class="span-16 last">
- <h2 id="contributing-to-libcloud">Contributing to libcloud</h2>
-<p>This pages explains how you can contribute to the libcloud project.</p>
-<p>Keep in mind that all kind of contributions are welcome (ideas, code, tests,
-documentation, examples, ...).</p>
-<h3 id="process"><a href="#process">Process</a></h3>
+ <h2 id="contributing-to-libcloud">Contributing to Libcloud</h2>
+<p>We welcome contributions of any kind (ideas, code, tests, documentation,
+examples, ...).</p>
+<p>This page explains how you can contribute to the Libcloud project. If you
get
+stuck at any point during this process, stop by on our IRC channel (#libcloud
+on freenode) and we will do our best to help you.</p>
+<h3 id="process"><a href="#process">General workflow</a></h3>
<ol>
-<li>Start a discussion on the <a href="devinfo.html">mailing list</a> (this
step is
-optional and only required if you want to implement big feature or a
change)</li>
-<li>Open a new issue on the
-<a href="https://issues.apache.org/jira/browse/LIBCLOUD";>bug tracker</a>
(JIRA)</li>
-<li>Fork libcloud <a href="https://github.com/apache/libcloud";>github git
repository</a>*
+<li>If you are implementing a big feature or a change, start a discussion on
+the <a href="devinfo.html">mailing list</a> first.</li>
+<li>Open a new issue on our
+<a href="https://issues.apache.org/jira/browse/LIBCLOUD";>issue tracker</a>
(JIRA)</li>
+<li>Fork libcloud <a href="https://github.com/apache/libcloud";>Github git
repository</a>*
and make your changes</li>
<li>Create a new branch for your changes:
- <code>git checkout -b jira_issue_id_change_name</code></li>
+ <code>git checkout -b <jira_issue_id>_<change_name></code></li>
<li>Make your changes</li>
-<li>Write tests for your modifications and make sure that all the tests still
-pass. For more informations about running the tests refer to the
+<li>Write tests for your modifications and make sure that all the tests pass.
+For more information about running the tests refer to the
<a href="/testing.html">Testing</a> page.</li>
-<li>Create a patch with your changes</li>
-<li>git (format-patch):
- <code>git format-patch --no-prefix --stdout trunk >
patch_name.patch</code></li>
-<li>git (diff):
- <code>git diff --no-prefix trunk your_branch > patch_name.patch</code></li>
-<li>svn: <code>svn diff > patch_name.patch</code></li>
-<li>Attach patch to the ticket you have created</li>
-<li>Wait for your patch to be reviewed and iterate on any potential
feedback</li>
+<li>Open a pull request with your changes. Your pull request will appear at
+https://github.com/apache/libcloud/pulls</li>
+<li>Wait for the code to be reviewed and address any outstanding comments.</li>
+<li>Once the code has been reviewed, all the outstanding issues have been
+addressed and the pull request has been ACK'ed, close the pull request,
+generate a patch and attach it to the JIRA issue you have created earlier:
+ <code>git format-patch --stdout trunk > patch_name.patch</code></li>
</ol>
-<p><em>Note: If you want you can also use SVN repository, but git and github
make
-branching and contributing a bit easier.</em></p>
+<p>Note: We use Github only for pull requests and code review. Once a pull
request
+has been reviewed, all the comments have been addresses and it's ready to be
+merged, user who submitted the pull request must close the pull request, create
+a patch and attach it to the original JIRA ticket.</p>
<h3 id="things_to_keep_in_mind"><a href="#things_to_keep_in_mind">Things To
Keep In Mind</a></h3>
<ul>
