Ceph » Stable releases

Before a backported commit can be merged into the release branch, it must be tested in an integration branch. It serves two purposes:

• Detect trivial problems that would break the upgrade tests run on the release branch (they are run at the tip of the branch, not at the latest point release)
• Do not pollute the release branch with reverted commits (because it cannot be rebased)

The snippet at http://workbench.dachary.org/dachary/ceph-workbench/issues/4 can help

• create a giant-backport branch if it does not already exists
• reset it to ceph/giant
• fetch all pull requests from github
• git merge all pull requests
• modify the pull requests individually to fix merge conflicts (i.e. they must merge cleanly, which may involving aggregating two pull requests into a single one designed to properly resolve the conflict)
• compile with ./autogen.sh ; ./configure ; make -j4
• modify the pull requests individually to fix compilation errors