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!: update ABCI query to use request height (backport #9879) #10185

Merged
merged 2 commits into from
Sep 16, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 16, 2021

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

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

You are currently cherry-picking commit c04ab50fd.
  (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:   client/grpc_query.go
	modified:   client/query.go
	new file:   client/query_test.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.io/

(cherry picked from commit c04ab50)

# Conflicts:
#	CHANGELOG.md
@robert-zaremba robert-zaremba added the A:automerge Automatically merge PR once all prerequisites pass. label Sep 16, 2021
@robert-zaremba robert-zaremba merged commit 7330f38 into release/v0.44.x Sep 16, 2021
@robert-zaremba robert-zaremba deleted the mergify/bp/release/v0.44.x/pr-9879 branch September 16, 2021 22:51
@amaury1093 amaury1093 added this to the v0.44.1 milestone Sep 29, 2021
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Oct 12, 2021
…osmos#10185)

* fix!: update ABCI query to use request height (cosmos#9879)

(cherry picked from commit c04ab50)

# Conflicts:
#	CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Nov 1, 2021
…osmos#10185)

* fix!: update ABCI query to use request height (cosmos#9879)

(cherry picked from commit c04ab50)

# Conflicts:
#	CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
…osmos#10185)

* fix!: update ABCI query to use request height (cosmos#9879)

(cherry picked from commit c04ab50)

* Update CHANGELOG.md

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…osmos#10185)

* fix!: update ABCI query to use request height (cosmos#9879)

(cherry picked from commit c04ab50)

# Conflicts:
#	CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass. C:CLI conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants