X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fdoc%2FVERSIONING;h=839c74678539fd353e247ac392c26c18781375a4;hb=a0adb0fc8a887a70cfb6de9941b567d8c041022e;hp=a1a8b62265db21b7cb1f4d429de1430ff918691a;hpb=94c2ba8fc1b4f13c29231f84d18ac3b7ade2d5ed;p=fs%2Flustre-release.git

diff --git a/lustre/doc/VERSIONING b/lustre/doc/VERSIONING
index a1a8b62..839c746 100644
--- a/lustre/doc/VERSIONING
+++ b/lustre/doc/VERSIONING
@@ -14,20 +14,20 @@ RPM's that you build should get 3 figure versions, CVS versions will
 be 4 digits, and can correspond to test RPM's, and lead up to the
 package version.  So let's plan on releasing
 
-So you'd build 2 sets of test rpms this week: 
+So you'd build 2 sets of test rpms this week:
 
 0.0.9.1
 0.0.9.2
 
-we decide it's fine then and we release 
+we decide it's fine then and we release
 
 0.1.0
 
-We go on developing with 
+We go on developing with
 
-0.1.0.{1,2,3,4,...} 
+0.1.0.{1,2,3,4,...}
 
-as test releases and then we release: 
+as test releases and then we release:
 
 0.1.1
 
@@ -41,36 +41,36 @@ CVS
 Versions will have 4 digits:
                      major.minor.patch.test
 
-Such versions will be tagged in CVS as:  
+Such versions will be tagged in CVS as:
                      v1_2_11_7
 and referred to as:
                      1.2.11.7
 encoded as:
                      0x01021107
 
-Usage: 
+Usage:
 ------
 
-New numbers are used as follows: 
+New numbers are used as follows:
 
-1. major: 
+1. major:
  - increased when major new functionality becomes available
-2. minor: 
+2. minor:
  - even: for each new release with new functionality
  - odd : when a new development cycle starts after a release
 3. patch:
  - when a development snapshot or release update becomes available
  - all these are announced on lustre-devel@lists.sf.net
-4. test: 
+4. test:
  - when developers feel it is time to exchange a named version
 
-What will run, what won't ? 
+What will run, what won't ?
 ---------------------------
 
 1. If the test level is non-zero, i.e. there are 4 digits in the
    version, no guarantees of any kind are made.
 
-2. For three digit releases/tags the code should perform 
+2. For three digit releases/tags the code should perform
    according to the announcement.
 
 Moving tags
@@ -82,16 +82,10 @@ The last operational development snapshot will be  CVS tag "dstable"
 Branches
 --------
 
-For even minor releases a branch tag will be created.  The branch tag
-will be of the form: 
+Any and all development must be done on branches, and can only merge to the
+HEAD if _at_least_ tests/acceptance-small.sh and IOR with 5 SMP nodes and
+2 clients/node with 1GB file/client pass without any errors or cleanup
+problems.  Additional tests may be added in the future, so the tests in the
+current CVS head must pass before a branch can be merged back to the trunk.
 
-bmajor_minor
-
-Note that the CVS head is where development is going.  If developers
-use a branch they must eventually merge that back into the head.
-Typically this is done by importing changes into the branch and
-removing the sticky tags:
-
-cvs update -A
-
-fixing any conflicts and then committing. 
+See http://lustre.org/docs/branches.html for details on CVS branch usage.