...
- Master needs to be stable at all times
- Pull requests will be merged after 2x LGTM and no -1 (we already agreed on this)
- 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 and finally master. No more cherry-picking!
- Only bug fixes will be fixed in release branches, no back porting of new features
- We should all use the same scripts to merge pull requests and do forward merges. The tools will be put are located in the CloudStack repository.
Goal written in “Scrum”-style story
...
{"serverDuration": 91, "requestCorrelationId": "7049942318522658"}