Commit f89df5b496b3d2f64c9c7493848755c5baad46f4

Authored by dosire
1 parent 2adbc0b7

Do not branch from master until release is done.

Showing 1 changed file with 7 additions and 6 deletions   Show diff stats
doc/release/monthly.md
... ... @@ -58,12 +58,13 @@ Check if changed since last release (~22nd of last month depending on when last
58 58  
59 59 After making the release branch new commits are cherry-picked from master. When the release gets closer we get more selective what is cherry-picked. The days of the month are approximately as follows:
60 60  
61   -* 17th: feature freeze (branch and stop merging new features)
62   -* 18th: UI freeze (stop cherry-picking changes to the user interface)
63   -* 19th: code freeze (stop cherry-picking non-essential code improvements)
64   -* 20th: release candidate 1 (tag and tweet about x.x.rc1)
65   -* 21st: release candidate 2 (optional, only if rc1 had problems)
66   -* 22nd: release (update VERSION and CHANGELOG, tag, blog and tweet)
  61 +* 17th: feature freeze (stop merging new features in master)
  62 +* 18th: UI freeze (stop merging changes to the user interface)
  63 +* 19th: code freeze (stop merging non-essential code improvements)
  64 +* 20th: release candidate 1 (VERSION x.x.0.pre, tag and tweet about x.x.0.rc1)
  65 +* 21st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems)
  66 +* 22nd: release (VERSION x.x.0, create x-x-stable branch, tag, blog and tweet)
  67 +* 23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems)
67 68  
68 69 # Write a blog post
69 70  
... ...