Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 10, 2022

This is an automatic backport of pull request #1919 done by Mergify.
Cherry-pick of 897e7eb has failed:

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

You are currently cherry-picking commit 897e7eb.
  (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:   modules/core/04-channel/keeper/packet.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

* fix: "acknowledgement written" logs unsupported type

* Updating CHANGELOG.md

Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit 897e7eb)

# Conflicts:
#	CHANGELOG.md
@crodriguezvega crodriguezvega merged commit c2a4d7b into release/v4.0.x Aug 12, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v4.0.x/pr-1919 branch August 12, 2022 08:19
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 27, 2023
…#1919) (cosmos#1961)

* fix: "acknowledgement written" logs unsupported type (cosmos#1919)

* fix: "acknowledgement written" logs unsupported type

* Updating CHANGELOG.md

Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit 897e7eb)

# Conflicts:
#	CHANGELOG.md

* fix conflict

Co-authored-by: Joe Abbey <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…#1919) (cosmos#1961)

* fix: "acknowledgement written" logs unsupported type (cosmos#1919)

* fix: "acknowledgement written" logs unsupported type

* Updating CHANGELOG.md

Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit 897e7eb)

# Conflicts:
#	CHANGELOG.md

* fix conflict

Co-authored-by: Joe Abbey <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…#1919) (cosmos#1961)

* fix: "acknowledgement written" logs unsupported type (cosmos#1919)

* fix: "acknowledgement written" logs unsupported type

* Updating CHANGELOG.md

Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit 897e7eb)

# Conflicts:
#	CHANGELOG.md

* fix conflict

Co-authored-by: Joe Abbey <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
@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.

3 participants