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

remove port prefix requirement (backport #2590) #2633

Merged
merged 2 commits into from
Oct 31, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 28, 2022

This is an automatic backport of pull request #2590 done by Mergify.
Cherry-pick of 5f9966b has failed:

On branch mergify/bp/release/v4.2.x/pr-2590
Your branch is up to date with 'origin/release/v4.2.x'.

You are currently cherry-picking commit 5f9966b.
  (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:   CHANGELOG.md
	modified:   modules/apps/27-interchain-accounts/host/keeper/handshake_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/27-interchain-accounts/host/keeper/handshake.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

* remove port prefix requirement

* chore: remove depcrated test and fix lint

* add changelog entry

* Update CHANGELOG.md

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit 5f9966b)

# Conflicts:
#	modules/apps/27-interchain-accounts/host/keeper/handshake.go
@lgtm-com
Copy link

lgtm-com bot commented Oct 28, 2022

This pull request introduces 2 alerts when merging f2032ee into 4492175 - view on LGTM.com

new alerts:

  • 2 for Unreachable statement

@colin-axner colin-axner merged commit 03479d5 into release/v4.2.x Oct 31, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v4.2.x/pr-2590 branch October 31, 2022 13:23
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 27, 2023
* remove port prefix requirement (cosmos#2590)

* remove port prefix requirement

* chore: remove depcrated test and fix lint

* add changelog entry

* Update CHANGELOG.md

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit 5f9966b)

# Conflicts:
#	modules/apps/27-interchain-accounts/host/keeper/handshake.go

* fix conflict

Co-authored-by: LaurensKubat <32776056+LaurensKubat@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
* remove port prefix requirement (cosmos#2590)

* remove port prefix requirement

* chore: remove depcrated test and fix lint

* add changelog entry

* Update CHANGELOG.md

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit 5f9966b)

# Conflicts:
#	modules/apps/27-interchain-accounts/host/keeper/handshake.go

* fix conflict

Co-authored-by: LaurensKubat <32776056+LaurensKubat@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
* remove port prefix requirement (cosmos#2590)

* remove port prefix requirement

* chore: remove depcrated test and fix lint

* add changelog entry

* Update CHANGELOG.md

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit 5f9966b)

# Conflicts:
#	modules/apps/27-interchain-accounts/host/keeper/handshake.go

* fix conflict

Co-authored-by: LaurensKubat <32776056+LaurensKubat@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
@ulbqb ulbqb mentioned this pull request Jul 31, 2023
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants