We already agreed contributions should always go via a PR and require two LGTM’s before we merge. This is the next step: How we should do release management for This page describes the Release Management principles for Apache CloudStack 4.6 and onnewer releases.
Contents:
...
- Master needs to be stable at all times
- Pull requests will be merged after 2x LGTM and no -1 (see below)
- When a release is being prepared, master will be “frozen” for new features (we aim to keep this window as short as possible)
- Release branch will be branched off of master as soon as a release candidate (RC) vote passes (no more QA on release branches before release)
- Bug fixes should be fixed on a release branch first, then merged forward to the next release (if any) and finally master. No more cherry-picking!to master.
Important: The commit hashes from the Pull Request should stil be the same in all branches this commit is in (cherry-picking cannot do this). - Only bug fixes will be fixed in release branches, there will be no back porting of new features
- We should all use the same scripts to merge pull requests and do forward merges. The tools are located in the CloudStack repository.
...