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: Add sender to fungible_token_packet events (backport #1414) #1423

Merged
merged 5 commits into from
May 24, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 24, 2022

This is an automatic backport of pull request #1414 done by Mergify.
Cherry-pick of f05a7cf has failed:

On branch mergify/bp/release/v2.1.x/pr-1414
Your branch is up to date with 'origin/release/v2.1.x'.

You are currently cherry-picking commit f05a7cf.
  (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)
	deleted by us:   modules/apps/transfer/ibc_module.go

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

Cherry-pick of c809c51 has failed:

On branch mergify/bp/release/v2.1.x/pr-1414
Your branch is ahead of 'origin/release/v2.1.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c809c51.
  (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 <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

Cherry-pick of d8be3d0 has failed:

On branch mergify/bp/release/v2.1.x/pr-1414
Your branch is ahead of 'origin/release/v2.1.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d8be3d0.
  (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 <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

Cherry-pick of 46d73a0 has failed:

On branch mergify/bp/release/v2.1.x/pr-1414
Your branch is ahead of 'origin/release/v2.1.x' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 46d73a0.
  (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 <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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://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

chatton and others added 4 commits May 24, 2022 07:14
(cherry picked from commit f05a7cf)

# Conflicts:
#	modules/apps/transfer/ibc_module.go
(cherry picked from commit c809c51)

# Conflicts:
#	CHANGELOG.md
(cherry picked from commit d8be3d0)

# Conflicts:
#	CHANGELOG.md
Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit 46d73a0)

# Conflicts:
#	CHANGELOG.md
@crodriguezvega crodriguezvega merged commit 7c5db65 into release/v2.1.x May 24, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v2.1.x/pr-1414 branch May 24, 2022 18:35
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