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

test(e2e): traffic route test with default tr policy (backport of #11523) #11640

Merged
merged 4 commits into from
Oct 3, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 3, 2024

Automatic cherry-pick of #11523 for branch release-2.5

Generated by action

cherry-picked commit a060222
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.5
Your branch is up to date with 'origin/release-2.5'.

You are currently cherry-picking commit a06022240.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   test/e2e_env/universal/trafficroute/traffic_route.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e_env/universal/universal_suite_test.go

Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
@kumahq kumahq bot requested a review from a team as a code owner October 3, 2024 08:54
@kumahq kumahq bot requested review from bartsmykla and lobkovilya and removed request for a team October 3, 2024 08:54
Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>
@Automaat Automaat enabled auto-merge (squash) October 3, 2024 09:09
@Automaat Automaat removed the conflict label Oct 3, 2024
@Automaat Automaat merged commit 6256c1d into release-2.5 Oct 3, 2024
5 checks passed
@Automaat Automaat deleted the chore/backport-release-2.5-11523 branch October 3, 2024 11:26
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.

2 participants