-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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(release): forward 3.7.0 changelog to master #13145
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Don't need to cherry-pick to EE. |
github-actions
bot
added
core/docs
cherry-pick kong-ee
schedule this PR for cherry-picking to kong/kong-ee
labels
Jun 3, 2024
fffonion
approved these changes
Jun 3, 2024
raoxiaoyan
approved these changes
Jun 3, 2024
kikito
approved these changes
Jun 3, 2024
Co-authored-by: lena-larionova <[email protected]> Co-authored-by: Vinicius Mignot <[email protected]>
Co-authored-by: Andy Zhang <[email protected]>
kikito
force-pushed
the
forward-backport-3.7.0-changelog
branch
from
June 3, 2024 12:39
8bfb8c2
to
59d9c6b
Compare
rebased over master in order to fix conflicts. Merging when green |
Cherry-pick failed for Please cherry-pick the changes locally. git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13145-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13145-to-master-to-upstream
git checkout -b cherry-pick-13145-to-master-to-upstream
ancref=$(git merge-base e90cafc54cdb04dbd78a6d52db4410af9f12ffd7 59d9c6b4feab5cd61bf36e8f288db8b7ff4ffda3)
git cherry-pick -x $ancref..59d9c6b4feab5cd61bf36e8f288db8b7ff4ffda3 |
github-actions
bot
added
the
incomplete-cherry-pick
A cherry-pick was incomplete and needs manual intervention
label
Jun 3, 2024
No need to cherrypick this one. Removing label. |
kikito
removed
incomplete-cherry-pick
A cherry-pick was incomplete and needs manual intervention
cherry-pick kong-ee
schedule this PR for cherry-picking to kong/kong-ee
labels
Jun 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Forward merge 3.7.0 changelog generation PRs to master:
#12965
#13058
Checklist
changelog/unreleased/kong
orskip-changelog
label added on PR if changelog is unnecessary. README.mdIssue reference
KAG-4422
Fix #[issue number]