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

[backport -> release/3.6.x] chore(patches): cleanup the pcre2 regex patch #12728

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

team-gateway-bot
Copy link
Collaborator

Automated backport to release/3.6.x, triggered by a label in #12705.

Original description

Summary

This adds two commits from @zhongweiy as found here: openresty/lua-nginx-module#2291 openresty/stream-lua-nginx-module#341

They are cleanups to original patch.

KAG-3614

### Summary

This adds two commits from @zhongweiy as found here:
openresty/lua-nginx-module#2291
openresty/stream-lua-nginx-module#341

They are cleanups to original patch.

Signed-off-by: Aapo Talvensaari <[email protected]>
(cherry picked from commit 5fea640)
@bungle bungle merged commit e858efc into release/3.6.x Mar 13, 2024
40 checks passed
@bungle bungle deleted the backport-12705-to-release/3.6.x branch March 13, 2024 13:56
@team-gateway-bot
Copy link
Collaborator Author

Cherry-pick failed for release/3.6.x: couldn't find remote ref release/3.6.x.
Please ensure that this Github repo has a branch named release/3.6.x.

@team-gateway-bot
Copy link
Collaborator Author

Cherry-pick failed for release/3.6.x, because it was unable to create a new branch.

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream release/3.6.x
git worktree add -d .worktree/cherry-pick-12728-to-release/3.6.x-to-upstream upstream/release/3.6.x
cd .worktree/cherry-pick-12728-to-release/3.6.x-to-upstream
git checkout -b cherry-pick-12728-to-release/3.6.x-to-upstream
ancref=$(git merge-base 4c0f01cf558018f9d684f77512210f1e4a4415b1 f58e60185ea82235fdc682f2a19fd60509682549)
git cherry-pick -x $ancref..f58e60185ea82235fdc682f2a19fd60509682549

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee size/L skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants