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

chore: update to rc2 (backport #3095) #3100

Merged
merged 3 commits into from
Feb 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 1, 2023

This is an automatic backport of pull request #3095 done by Mergify.
Cherry-pick of 1a204fe has failed:

On branch mergify/bp/release/v7.0.x/pr-3095
Your branch is up to date with 'origin/release/v7.0.x'.

You are currently cherry-picking commit 1a204fed.
  (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:   go.mod
	modified:   go.sum
	modified:   modules/apps/27-interchain-accounts/host/keeper/relay_test.go
	modified:   modules/apps/27-interchain-accounts/module.go
	modified:   modules/apps/27-interchain-accounts/simulation/params.go
	modified:   modules/apps/29-fee/module.go
	modified:   modules/apps/transfer/module.go
	modified:   modules/apps/transfer/simulation/params.go
	modified:   modules/core/module.go
	modified:   testing/simapp/utils.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   e2e/go.mod
	deleted by us:   e2e/go.sum

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

Co-authored-by: Marko Baricevic <[email protected]>
Co-authored-by: Cian Hatton <[email protected]>
(cherry picked from commit 1a204fe)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
Copy link
Contributor

@chatton chatton left a comment

Choose a reason for hiding this comment

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

LGTM

@damiannolan damiannolan merged commit 22dd4a5 into release/v7.0.x Feb 2, 2023
@damiannolan damiannolan deleted the mergify/bp/release/v7.0.x/pr-3095 branch February 2, 2023 09:48
@faddat faddat mentioned this pull request Jun 23, 2023
9 tasks
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.

3 participants