Author: brock
Date: Wed Oct 17 14:56:03 2012
New Revision: 1399288
URL: http://svn.apache.org/viewvc?rev=1399288&view=rev
Log:
FLUME-1646: Update source repository website
Modified:
flume/site/trunk/content/sphinx/source.rst
Modified: flume/site/trunk/content/sphinx/source.rst
URL:
http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/source.rst?rev=1399288&r1=1399287&r2=1399288&view=diff
==============================================================================
--- flume/site/trunk/content/sphinx/source.rst (original)
+++ flume/site/trunk/content/sphinx/source.rst Wed Oct 17 14:56:03 2012
@@ -21,7 +21,7 @@ The following is a link to the online so
Flume maintains an active release branch along with trunk. The release branch
represents the list of commits that will go into the next release.
All commits that go into trunk will also have to be committed using git
cherry-pick and pushed to the current release branch.
-The current release branch is flume-1.3.0.
+The current release branch is flume-1.4.
The source can be checked out anonymously from git with this command:::
@@ -41,14 +41,14 @@ Committers should first commit the patch
Copy the commit hash of the commit you just made. Then::
- $ git checkout flume-1.3.0 (or the current release branch)
+ $ git checkout flume-1.4 (or the current release branch)
$ git pull
$ git cherry-pick <commit hash of the commit you made> (This should get
committed immediately).
Now push to both trunk and the release branch::
$ git push -u origin trunk
- $ git push -u origin flume-1.3.0
+ $ git push -u origin flume-1.4
For more details, please read: `Git at Apache
<https://git-wip-us.apache.org/>`_. Please read the
`Common Errors page <https://git-wip-us.apache.org/docs/common-errors.html>`_
if you face any problems.
@@ -65,10 +65,10 @@ When a release is finalized, the current
branched off the current release branch. The new branch will represent the
next release and all commits not meant for the current release must
go to the new branch once the current branch is frozen. The release manager
then pushes release related commits to the current branch.
-For example, if the next release is flume-1.3.0, all commits should go to
trunk and flume-1.3.0.
-When the release is finalized, the release manager will create a new branch,
say flume-1.4.0 from the latest commit of
-flume-1.3.0. All further non-release related commits should go to trunk and
flume-1.4.0 (unless the release manager thinks otherwise - in which case it can
-go to flume-1.3.0 and flume-1.4.0).
+For example, if the next release is flume-1.4.0, all commits should go to
trunk and flume-1.4.
+When the rolling release canidate, the release manager will create a new
branch, say flume-1.5 from the latest commit of
+flume-1.4. All further non-release related commits should go to trunk and
flume-1.5 (unless the release manager thinks otherwise - in which case it can
+go to flume-1.4 and flume-1.5).
Please note that the main development branch is **trunk**, not master.
