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

fix: Add Events to TxResponse (backport #10630) #10643

Merged
merged 6 commits into from
Dec 2, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 30, 2021

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

On branch mergify/bp/release/v0.44.x/pr-10630
Your branch is up to date with 'origin/release/v0.44.x'.

You are currently cherry-picking commit c4bedf8a5.
  (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:   proto/cosmos/base/abci/v1beta1/abci.proto
	modified:   types/result_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.sum
	both modified:   types/abci.pb.go
	both modified:   types/result.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 c4bedf8)

# Conflicts:
#	CHANGELOG.md
#	go.sum
#	types/abci.pb.go
#	types/result.go
@amaury1093
Copy link
Contributor

@alexanderbez would you mind taking care of fixing the conflicts on the 2 backport PRs?

@alexanderbez alexanderbez self-assigned this Nov 30, 2021
@tac0turtle
Copy link
Member

@alexanderbez something here please 😄

@amaury1093 amaury1093 merged commit fd34e37 into release/v0.44.x Dec 2, 2021
@amaury1093 amaury1093 deleted the mergify/bp/release/v0.44.x/pr-10630 branch December 2, 2021 15:43
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
* fix: Add Events to TxResponse (cosmos#10630)

(cherry picked from commit c4bedf8)

* FOR REAL.

* Merging the merge

* This is not a commit

* You wouldn't get this from any other guy

* We'll figure it out on Monday

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>
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.

None yet

4 participants