diff options
Diffstat (limited to 'PROCESS.md')
| -rw-r--r-- | PROCESS.md | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/PROCESS.md b/PROCESS.md index aadd6a321f0..8859b6b7212 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -75,9 +75,13 @@ star, smile, etc.). Some good tips about code reviews can be found in our ## Feature freeze on the 7th for the release on the 22nd After 7th at 23:59 (Pacific Time Zone) of each month, RC1 of the upcoming -release (to be shipped on the 22nd) is created and deployed to GitLab.com and -the stable branch for this release is frozen, which means master is no longer -merged into it. Merge requests may still be merged into master during this +release (to be shipped on the 22nd) is created and deployed to GitLab.com. +The stable branch for this release is frozen, which means master is no longer +merged into it. Release managers can decide to include the last known green +pipeline as a last item going to a stable branch, regardless of whether +the feature freeze time has passed. + +Merge requests may still be merged into master during this period, but they will go into the _next_ release, unless they are manually cherry-picked into the stable branch. |