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

add orderBy parameter to TxsByEvents (bp #8815) #8883

Merged
merged 4 commits into from
Mar 17, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 15, 2021

This is an automatic backport of pull request #8815 done by Mergify.

Cherry-pick of 553aac5 has failed:

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

You are currently cherry-picking commit 553aac503.
  (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:   x/auth/tx/service.go

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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/

* add orderBy parameter to grpc query

* add orderby parameter

* change orderBy param to enum

* lint

* proto lint

* add changelog

* Update x/auth/tx/service.go

Co-authored-by: Amaury <[email protected]>

Co-authored-by: Alessio Treglia <[email protected]>
Co-authored-by: Jonathan Gimeno <[email protected]>
Co-authored-by: Amaury <[email protected]>
(cherry picked from commit 553aac5)

# Conflicts:
#	x/auth/tx/service.go
@mergify mergify bot added the conflicts label Mar 15, 2021
@orijbot
Copy link

orijbot commented Mar 15, 2021

@orijbot
Copy link

orijbot commented Mar 15, 2021

Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adf5f62 also needs to be backported into the same PR. @aleem1314 could you take care of that?

@alessio alessio added this to the v0.42.2 milestone Mar 15, 2021
Co-authored-by: Alessio Treglia <[email protected]>
Co-authored-by: Jonathan Gimeno <[email protected]>
@orijbot
Copy link

orijbot commented Mar 16, 2021

@orijbot
Copy link

orijbot commented Mar 16, 2021

@orijbot
Copy link

orijbot commented Mar 17, 2021

@orijbot
Copy link

orijbot commented Mar 17, 2021

@aleem1314 aleem1314 requested a review from amaury1093 March 17, 2021 09:20
@sahith-narahari
Copy link
Contributor

@aleem1314 there seems to be proto breakage, can we bump the version?

@amaury1093
Copy link
Contributor

@sahith-narahari No, this CI check is not working properly on release/* branches: it shouts about authz, but authz doesn't exist on Stargate! Propose to fix/disable it here: #8907

In the meantime, a manual check confirms that this is NOT a proto-breaking change (only proto additions). If someone else wans to double-check, that would be good.

@sahith-narahari
Copy link
Contributor

@sahith-narahari No, this CI check is not working properly on release/* branches: it shouts about authz, but authz doesn't exist on Stargate! Propose to fix/disable it here: #8907

In the meantime, a manual check confirms that this is NOT a proto-breaking change (only proto additions). If someone else wans to double-check, that would be good.

Thanks, that makes sense.

@alessio alessio merged commit 177672f into release/v0.42.x Mar 17, 2021
@alessio alessio deleted the mergify/bp/release/v0.42.x/pr-8815 branch March 17, 2021 10:49
@orijbot
Copy link

orijbot commented Mar 17, 2021

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.

5 participants