Per some offline discussions, I'm preparing to do some changes to the
layout of the ganeti repository.
The proposed layout is:
- main development (heavy changes, unstable tree) done on “master”
- each release line (the current “branch-X.Y” names) will have two
branches:
- “stable-X.Y” for the releases and fixes being done during rc
series; similar usage to the current “branch-2.0” branch
- “devel-X.Y” for any non-trivial changes being done on a release
line (which, due to practical reasons, does happen); this is
similar usage to the current “next” branch
This will bring it more in-line with the way git repositories are
usually arranged (master + some release branches).
The changes needed to achieve these are:
- ‘master’ changes: merge ‘master’ into ‘branch-2.1’; since there are
no commits on master that haven't been merged already, this will be
just a fast-forward
- 2.1 changes: rename ‘branch-2.1’ into ‘stable-2.1’, and create
‘devel-2.1’ from it
- 2.0 changes: create branch ‘stable-2.0’ and ‘devel-2.0’ from ‘next’,
then drop ‘next’
- 1.2 changes: drop ‘branch-1.2’ (the tag v1.2.8 will keep the commits
referenced); if we ever need a commit on the 1.2 branch, then we'll
create the ‘stable-1.2’ branch
- cleanup: drop the ‘feature/containers’ branch, we never go to use
the ‘feature/*’ model as intended originally so…
These changes will leave stable branches if anyone mirrors the git
repository without --mirror, but no information is actually lost or
overwritten, so I think announcement on ganeti-devel should be enough.
Comments, LGTMs?
iustin
