We have talked about this on the weekly calls, but for those of you who have not been able to attend, here's a summary of our expected plans with git branches, github repos, etc.:
1. v2.0.0 has been released. Yay! 2. A picture is worth 1,000 words: below is the git branching plan for the v2.x series going forward (more discussion below): [cid:A46BCBDC-157A-49DB-B3F0-D772072AED93@cdnivt.cisco.com] 3. Today will be the end of the mandatory 2-day hold on merging anything into the v2.x branch. We have this 2-day hold for the "oh crud!" factor after a large release -- i.e., in case anything major is discovered right after the release, we can do a small commit to fix the problem, and then re-release (without anything else new). This means that tomorrow, Howard and I will start merging some of the existing v2.0.1 PRs. We'll likely merge in several a day and let MTT and friends chug through them. It'll probably only take a few days to chug through the v2.0.1 PRs -- most of them are small / low risk. 4. As a reminder, v2.0.1 is ONLY for bug fixes. No new features will be accepted. Backwards compatibility with v2.0.0 MUST be preserved. 5. Once we have finished merging most (all?) v2.0.1 PRs, we'll create a v2.0.x branch from the v2.x branch. The v2.0.1 release (and subsequent v2.0.x releases) will come from that branch. 6. The v2.x branch will continue on and eventually become v2.1.0. v2.1.0 will be backwards compatible with v2.0.0. 7. We may need to have pull requests to multiple release branches (e.g., to fix a bug in both v2.0.1 and v2.1.0). 8. As a reminder, we have two Github repos: ompi and ompi-release. ompi contains the development master, and ompi-release contains all the release branches. We did this split because Github didn't used to support per-branch ACLs. Now they do, and now that we have released v2.0.0 we can officially start thinking about folding the ompi-release repo back into the ompi repo. ...however, as you all know, we're in the middle of migrating all of Open MPI's hosting infrastructure away from Indiana U., and that's taking quite a bit of time and effort. As such, the "fold ompi-release back into ompi" plan may get delayed a bit. Sorry folks -- there's only so many sysadmin-related cycles to go around, and the migration efforts have concrete deadlines. :-\ Bear with us until we can get this done. -- Jeff Squyres jsquy...@cisco.com<mailto:jsquy...@cisco.com> For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/
