On branch release-2.7
Your branch is up to date with 'origin/release-2.7'.
You are currently cherry-picking commit 844c9881c.
(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:
new file: pkg/plugins/policies/meshtimeout/plugin/testdata/basic_without_defaults_inbound_cluster.golden.yaml
new file: pkg/plugins/policies/meshtimeout/plugin/testdata/basic_without_defaults_inbound_listener.golden.yaml
modified: pkg/plugins/policies/meshtimeout/plugin/v1alpha1/plugin_test.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: pkg/plugins/policies/meshtimeout/plugin/v1alpha1/plugin.go
Automatic cherry-pick of #12043 for branch release-2.7
Generated by action
cherry-picked commit 844c9881c6079b8f6064b0bf7c17f49a05e5e853 :warning: :warning: :warning: Conflicts happened when cherry-picking! :warning: :warning: :warning: