-{section: Goals for next developer and stable release}
+{section: State of the Condor Repository and Release Plans}
-This page details goals for upcoming releases.
+This page details what release branches are active, and targets for upcoming releases. Check here often, this page will be updated regularly.
-----------------
-{subsection: Developer Release}
+
+{subsection: Active release branches, or where should my code go?}
+
+*: Code that implements new features, aka code targeted for v7.5.x, should go into branch *master*.
+
+*: Code that fixes bugs introduced in the v7.3.x series, and therefore is targeted for v7.4.x, should go into branch *V7_4-branch*, and be merged into master.
+
+*: Code that fixes _serious_ bugs that existed in v7.2.x should go into branch *V7_2-branch*, and be merged into branches V7_3_2-branch, V7_4-branch, and master. Once we release v7.4.0, we can abandon the V7_2-branch.
+
+*: Code that must go into v7.3.2 should go into the *V7_3_2-branch* release branch and then merged into V7_4-branch and master. _However, you had better get permission from the wranger_, and v7.3.2 is now frozen.
+
+
+-----------------
+
+{subsection: Goals for next 7.3.x Developer Release}
*Version*: 7.3.2
*Target Date*: Mid July 2009
@@ -22,7 +36,8 @@
CurrentTestProblems I'd like to fix before releasing.
------------------
-{subsection: Stable Release}
+
+{subsection: Goals for 7.2.x Stable Release}
*Version*: 7.2.4
*Target Date*: None, currently
@@ -30,4 +45,5 @@
*Wrangler*: {wiki: NickLeRoy Nick LeRoy}
{report: 26}
+
------------------
