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

Adding ICA Host module (backport #1564) #1576

Merged
merged 3 commits into from
May 25, 2022
Merged

Adding ICA Host module (backport #1564) #1576

merged 3 commits into from
May 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 25, 2022

This is an automatic backport of pull request #1564 done by Mergify.
Cherry-pick of 09f3184 has failed:

On branch mergify/bp/v9.x/pr-1564
Your branch is up to date with 'origin/v9.x'.

You are currently cherry-picking commit 09f3184.
  (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:   app/keepers/keepers.go
	modified:   app/modules.go
	new file:   app/upgrades/v9/upgrade_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/upgrades/v9/constants.go
	both modified:   app/upgrades/v9/upgrades.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

(cherry picked from commit 09f3184)

# Conflicts:
#	app/upgrades/v9/constants.go
#	app/upgrades/v9/upgrades.go
@mergify mergify bot requested a review from a team May 25, 2022 01:14
@mergify mergify bot added the conflicts label May 25, 2022
@p0mvn p0mvn merged commit 3b89365 into v9.x May 25, 2022
@p0mvn p0mvn deleted the mergify/bp/v9.x/pr-1564 branch May 25, 2022 02:01
Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice work

@@ -64,9 +67,11 @@ import (
)

// moduleAccountPermissions defines module account permissions
// TODO: Having to input nil's here is unacceptable, we need a way to automatically derive this.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants