Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  1. In the GEODE Jira ticket, indicated the intended backport versions by adding a label in the format blocks-x.y.z
  2. Merge fix to develop (if it isn't already), then allow time for thorough testing (ideally at least a few days).
  3. Using git cherry-pick -x, work backward e.g. developsupport/1.15support/1.14  → support/1.13support/1.12
    It's good practice to create a PR for each support branch, even if the cherry-pick goes smoothly.  Remember to ./gradle spotlessApply on each branch.  If you are a committer, merge your PR once you are satisfied.  Contributors can email the dev list if help is needed to merge backport PRs.
  4. Update Fix versions and Resolve the GEODE ticket (Release Manager will transition it from Resolved to Closed upon release).

...

In general any fix that is worth backporting should go to all affected versions still in support (see Release Schedule for a list).  Do not skip backporting to any in-between branches (exception: it's ok to skip 1.13).

FAQ

Q: Can fixes that are low-risk but not of “critical or major importance” be backported?
A: Users expect minimal changeset in patch releases, but you're welcome to make your case on the dev list.

...