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

tests(db): add shorthands precedence test when using complex records #13554

Merged
merged 1 commit into from
Aug 23, 2024

Conversation

bungle
Copy link
Member

@bungle bungle commented Aug 22, 2024

Summary

Gladly we found an issue where merge conflict in EE was wrongly resolved (by me, @bungle, most likely) before we released.

Thanks to @nowNick for finding it out.

Here is the missing tests that hopefully helps us in a future to spot it better.

### Summary

Gladly we found an issue where merge conflict in EE was wrongly resolved
(by me, @bungle, most likely) before we released.

Thanks to @nowNick for finding it out.

Here is the missing tests that hopefully helps us in a future to spot it
better.

Signed-off-by: Aapo Talvensaari <[email protected]>
@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Aug 22, 2024
@bungle bungle added backport release/3.8.x and removed cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Aug 22, 2024
@bungle
Copy link
Member Author

bungle commented Aug 22, 2024

No need to cherry-pick to EE as it is included in:
https://github.com/Kong/kong-ee/pull/10057

@bungle bungle merged commit 1c9ca3f into master Aug 23, 2024
41 checks passed
@bungle bungle deleted the tests/shorthands_precedence branch August 23, 2024 07:12
@team-gateway-bot
Copy link
Collaborator

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants