Skip to content

e2e: add multiversion flag to generator (backport #9829)#9843

Merged
williambanfield merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9829
Dec 8, 2022
Merged

e2e: add multiversion flag to generator (backport #9829)#9843
williambanfield merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9829

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2022

This is an automatic backport of pull request #9829 done by Mergify.
Cherry-pick of ac48630 has failed:

On branch mergify/bp/v0.34.x/pr-9829
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit ac48630fd.
  (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/generator/generate.go
	modified:   test/e2e/generator/random.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/generator/main.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from ebuchman as a code owner December 6, 2022 16:18
@mergify mergify bot requested a review from a team December 6, 2022 16:18
@mergify mergify bot requested review from adizere and lasarojc as code owners December 6, 2022 16:18
@mergify mergify bot added the conflicts label Dec 6, 2022
* add multiversion flag to generator

* clarify flag comment

(cherry picked from commit ac48630)
@williambanfield williambanfield force-pushed the mergify/bp/v0.34.x/pr-9829 branch from e702585 to 61cbe57 Compare December 7, 2022 19:01
@williambanfield williambanfield merged commit 0ab2ae2 into v0.34.x Dec 8, 2022
@williambanfield williambanfield deleted the mergify/bp/v0.34.x/pr-9829 branch December 8, 2022 16:41
@moul moul mentioned this pull request Mar 6, 2025
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.

1 participant