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(distr): add distribution authorization (backport #35) #43

Merged
merged 5 commits into from
Jul 20, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 20, 2023

This is an automatic backport of pull request #35 done by Mergify.
Cherry-pick of 3c10148 has failed:

On branch mergify/bp/ledger/v0.47.x/pr-35
Your branch is up to date with 'origin/ledger/v0.47.x'.

You are currently cherry-picking commit 3c1014899.
  (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:
	new file:   proto/cosmos/distribution/v1beta1/authz.proto
	new file:   x/distribution/types/authz.go
	new file:   x/distribution/types/authz.pb.go
	new file:   x/distribution/types/authz_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/integration/distribution/keeper/grpc_query_test.go
	both modified:   x/distribution/types/codec.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 3c10148)

# Conflicts:
#	tests/integration/distribution/keeper/grpc_query_test.go
#	x/distribution/types/codec.go
@GAtom22 GAtom22 merged commit e1cdf73 into ledger/v0.47.x Jul 20, 2023
23 of 25 checks passed
@GAtom22 GAtom22 deleted the mergify/bp/ledger/v0.47.x/pr-35 branch July 20, 2023 16:08
GAtom22 added a commit that referenced this pull request Jul 31, 2023
MalteHerrmann pushed a commit that referenced this pull request Oct 26, 2023
MalteHerrmann pushed a commit that referenced this pull request Oct 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants