Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update CHANGELOG.md with hotfix/2.14.2 #1978

Merged
merged 2 commits into from
Jul 30, 2024

Conversation

ncreated
Copy link
Member

What and why?

📦 We cherry-pick #1968 and #1967 fixes to 2.14.x release, making 2.14.2 hotfix.

How?

We don't follow regular git-flow for this hotfix as the released change already exists in 2.15.0 and we only cherry-pick it to 2.14.x family.

The 2.14.2 tag will be put on the last commit from hotfix/2.14.2 branch. Check hotfix/2.14.2master diff to review what we're about to release.

Review checklist

  • Feature or bugfix MUST have appropriate tests (unit, integration)
  • Make sure each commit and the PR mention the Issue number or JIRA reference
  • Add CHANGELOG entry for user facing changes

we don't follow regular git-flow for this hotfix as the released
change already exists in `2.15.0` and we only cherry-pick it
@ncreated ncreated requested review from a team as code owners July 26, 2024 15:35
maxep
maxep previously approved these changes Jul 26, 2024
@ganeshnj
Copy link
Contributor

@ncreated were there any PRs for cherry pick? I wonder how the cherrypicked changes tested in CI?

@ncreated
Copy link
Member Author

@ncreated were there any PRs for cherry pick? I wonder how the cherrypicked changes tested in CI?

Commits were cherry-picked directly to release branch and validated in CI. This might be not our preferred flow, so I updated the release playbook with extra notes on shipping a hotfix to past release (internal).

@ncreated ncreated merged commit 986738b into develop Jul 30, 2024
17 checks passed
@ncreated ncreated deleted the ncreated/chore/update-changelog-for-2.14.2-hotfix branch July 30, 2024 06:52
@maxep maxep mentioned this pull request Aug 20, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants