Source Code Branches

Not logged in

• Browse
• Help
• Home
• Login
• Reports
• Search
• Timeline
• Wiki

• Contents
• Diff
• Text

Active source code release branches, or where should my code go?

Current as of June 14, 2011.

• Commits intended for 7.6.2 of Condor should go into the V7_6_2-branch and then be merged into V7_6-branch, and then into master. ALL COMMITS TO THE V7_6_2-branch BRANCH MUST BE CODE REVIEWED AND COORDINATED WITH THE WRANGLER

• 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_0-branch, but only with permission from the wrangler. They 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 MUST BE CODE REVIEWED - the ticket should show who did the code review. Commits should then be merged into master.

Active doc branches, or where should my documentation go?

Current as of July 7, 2011.

• The master branch is for 7.7.1 documentation.

• The V7_7_0-branch is for all new-to-7.7 documentation, and especially items that are for 7.7.0.

• The V7_6-branch is for all documentation new and specific to 7.6.3.

• The V7_6_2-branch is for all 7.6.<2|1|0> documentation that should have been previously completed. Exception: should you find (especially version history items) things that should have been put on the 7.6.1 version/branch of the manual, please talk to Karen.

When in doubt, ask Karen.

List of all source code branches

Below is a table of all branches in our repository and when/who last did a commit to them. Documentation about what each branch is about is also available.

This work is supported by NSF under Cooperative Agreement OAC-2030508 as part of the PATh Project. Any opinions, findings, and conclusions or recommendations expressed in this material are those of the author(s) and do not necessarily reflect the views of the NSF. Site built using CVSTrac.