Author: stoty
Date: Mon Jun 8 11:53:15 2020
New Revision: 1878596
URL: http://svn.apache.org/viewvc?rev=1878596&view=rev
Log:
PHOENIX-5764 Update website to reflect the new 4.x branch (Richard Antal)
Modified:
phoenix/site/publish/contributing.html
phoenix/site/source/src/site/markdown/contributing.md
Modified: phoenix/site/publish/contributing.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/contributing.html?rev=1878596&r1=1878595&r2=1878596&view=diff
==============================================================================
--- phoenix/site/publish/contributing.html (original)
+++ phoenix/site/publish/contributing.html Mon Jun 8 11:53:15 2020
@@ -195,7 +195,7 @@
</div>
<div class="section">
<h3 id="Generate_a_patch">Generate a patch</h3>
- <p>There are two general approaches that can be used for creating and
submitting a patch: GitHub pull requests, or manually creating a patch with
Git. Both of these are explained below. Please make sure that the patch applies
cleanly on all the active branches including master: 5.x-HBase-2.0,
4.x-HBase-1.5, 4.x-HBase-1.4, and 4.x-HBase-1.3.</p>
+ <p>There are two general approaches that can be used for creating and
submitting a patch: GitHub pull requests, or manually creating a patch with
Git. Both of these are explained below. Please make sure that the patch applies
cleanly on all the active branches including <b>master</b> and the unified
<b>4.x</b> branch.</p>
<p>Regardless of which approach is taken, please make sure to follow the
Phoenix code conventions (more information below). Whenever possible, unit
tests or integration tests should be included with patches.</p>
<p>Please make sure that the patch contains only one commit and click on the
âSubmit patchâ button to automatically trigger the tests on the patch.</p>
<p>The commit message should reference the jira ticket issue (which has the
format <tt>PHOENIX-{NUMBER}:{JIRA-TITLE}</tt>).</p>
Modified: phoenix/site/source/src/site/markdown/contributing.md
URL:
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/contributing.md?rev=1878596&r1=1878595&r2=1878596&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/contributing.md (original)
+++ phoenix/site/source/src/site/markdown/contributing.md Mon Jun 8 11:53:15
2020
@@ -30,7 +30,7 @@ To setup your development, see [these](d
### Generate a patch
-There are two general approaches that can be used for creating and submitting
a patch: GitHub pull requests, or manually creating a patch with Git. Both of
these are explained below. Please make sure that the patch applies cleanly on
all the active branches including master: 5.x-HBase-2.0, 4.x-HBase-1.5,
4.x-HBase-1.4, and 4.x-HBase-1.3.
+There are two general approaches that can be used for creating and submitting
a patch: GitHub pull requests, or manually creating a patch with Git. Both of
these are explained below. Please make sure that the patch applies cleanly on
all the active branches including **master** and the unified **4.x** branch.
Regardless of which approach is taken, please make sure to follow the Phoenix
code conventions (more information below). Whenever possible, unit tests or
integration tests should be included with patches.
