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

feat(kumactl) install gateway types (backport #1950) #1964

Merged
merged 1 commit into from
May 11, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 7, 2021

This is an automatic backport of pull request #1950 done by Mergify.
Cherry-pick of 56443c1 has failed:

On branch mergify/bp/release-1.1/pr-1950
Your branch is up to date with 'origin/release-1.1'.

You are currently cherry-picking commit 56443c179.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   app/kumactl/cmd/completion/testdata/zsh.golden
	deleted by us:   app/kumactl/cmd/install/context/install_gateway_context.go
	deleted by us:   app/kumactl/cmd/install/install_gateway.go
	deleted by us:   app/kumactl/cmd/install/install_gateway_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

@mergify mergify bot requested a review from a team as a code owner May 7, 2021 18:04
@mergify mergify bot added the conflicts label May 7, 2021
* feat(kumactl) More flexible valid gateway types

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>

* fix(kumactl) make check updates

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>

* fix(kumactl) Address PR comment

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>

* fix(kumactl) Update protobufs with make check

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>

* fix(kumactl) Update tests

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>
@nickolaev nickolaev force-pushed the mergify/bp/release-1.1/pr-1950 branch from 7a7d952 to 97ffae9 Compare May 11, 2021 07:09
@nickolaev nickolaev merged commit 4a0a963 into release-1.1 May 11, 2021
@nickolaev nickolaev deleted the mergify/bp/release-1.1/pr-1950 branch May 11, 2021 13:03
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