Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Automatic cherry-pick of #11901 for branch release-2.6 Generated by [action](https://github.com/kumahq/kuma/actions/runs/12375804596) cherry-picked commit a649d8e⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking!⚠️ ⚠️ ⚠️ ``` On branch release-2.6 Your branch is up to date with 'origin/release-2.6'. You are currently cherry-picking commit a649d8e. (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/bootstrap/corefile_template.go deleted: test/e2e/helm/kuma_helm_deploy_multi_apps.go Unmerged paths: (use "git add <file>..." to mark resolution) both modified: test/e2e/helm/e2e_suite_test.go ``` --------- Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com> Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com> Co-authored-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com> Co-authored-by: Lukasz Dziedziak <lukidzi@gmail.com>
- Loading branch information