Author: buildbot
Date: Fri Aug 24 21:00:28 2012
New Revision: 830059
Log:
Staging update by buildbot for flume
Modified:
websites/staging/flume/trunk/content/ (props changed)
websites/staging/flume/trunk/content/.doctrees/environment.pickle
websites/staging/flume/trunk/content/.doctrees/source.doctree
websites/staging/flume/trunk/content/_sources/source.txt
websites/staging/flume/trunk/content/source.html
Propchange: websites/staging/flume/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Aug 24 21:00:28 2012
@@ -1 +1 @@
-1377079
+1377110
Modified: websites/staging/flume/trunk/content/.doctrees/environment.pickle
==============================================================================
Binary files - no diff available.
Modified: websites/staging/flume/trunk/content/.doctrees/source.doctree
==============================================================================
Binary files - no diff available.
Modified: websites/staging/flume/trunk/content/_sources/source.txt
==============================================================================
--- websites/staging/flume/trunk/content/_sources/source.txt (original)
+++ websites/staging/flume/trunk/content/_sources/source.txt Fri Aug 24
21:00:28 2012
@@ -63,7 +63,8 @@ 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, and it is finalized, the
release manager will create a new branch, say flume-1.4.0 from the latest
commit of
+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).
Modified: websites/staging/flume/trunk/content/source.html
==============================================================================
--- websites/staging/flume/trunk/content/source.html (original)
+++ websites/staging/flume/trunk/content/source.html Fri Aug 24 21:00:28 2012
@@ -106,7 +106,8 @@ and required - since that would represen
<p>When a release is finalized, the current release branch will be frozen by
the release manager for the release, and a new release branch will be
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.</p>
-<p>For example, if the next release is flume-1.3.0, and it is finalized, the
release manager will create a new branch, say flume-1.4.0 from the latest
commit of
+<p>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).</p>
<p>Please note that the main development branch is <strong>trunk</strong>, not
master.</p>
