{section: Active source code release branches, or where should my code go?} -Current as of October 13th, 2011. +Current as of December 29th, 2011. *: Code that implements new features or non-urgent bug fixes, aka code targeted for v7.7.x, should go into branch *master*. -*: Urgent bug fixes to new features might go into *V7_7_3-branch*, but only with permission from the wrangler. They should then be merged through *V7_7_4-branch* and into *master*. +*: {strike} Urgent bug fixes to IPv6 go into *V7_7_5-branch*, but only with permission of the wrangler. They should then be merge into *master*.{endstrike} -*: Urgent bug fixes to IPv6 go into *V7_7_4-branch*, but only with permission of the wrangler and Alan {quote: DeSmet}. They should then be merge into *master*. +*: Serious bug fixes to stable series features should go into *V7_6-branch*. _ALL COMMITS TO A STABLE BRANCH {wiki: PerformingCodeReviews MUST BE CODE REVIEWED}_ - the ticket should show who did the code review. Commits should then be merged into *master*. -*: Serious bug fixes to stable series features should go into *V7_6-branch*. _ALL COMMITS TO A STABLE BRANCH {wiki: PerformingCodeReviews MUST BE CODE REVIEWED}_ - the ticket should show who did the code review. Commits should then be merged into *V7_7_3-branch*, and then to *V7_7_4-branch* and *master* as described above. - -*: Very Very Urgent bug fixes to old features might go into *V7_6_5-branch*, but only with permission from the wrangler, and merge from there into *V7_6-branch*, following rules above. +*: {strike}Very Very Urgent bug fixes to old features might go into *V7_6_6-branch*, but only with permission from the wrangler, and merge from there into *V7_6-branch*, following rules above.{endstrike} {section: List of all source code branches}