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 delegator to withdraw address (backport #15462) #15472

Merged
merged 4 commits into from
Mar 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2023

This is an automatic backport of pull request #15462 done by Mergify.
Cherry-pick of 176c61c has failed:

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

You are currently cherry-picking commit 176c61cf7.
  (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:   x/distribution/keeper/delegation.go
	modified:   x/distribution/types/events.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.com

(cherry picked from commit 176c61c)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner March 20, 2023 14:44
@mergify mergify bot added the conflicts label Mar 20, 2023
@github-actions github-actions bot added the C:x/distribution distribution module related label Mar 20, 2023
@github-advanced-security
Copy link

You have successfully added a new gosec configuration .github/workflows/gosec.yml:Gosec. As part of the setup process, we have scanned this repository and found 229 existing alerts. Please check the repository Security tab to see all alerts.

@tac0turtle tac0turtle enabled auto-merge (squash) March 20, 2023 15:00
@tac0turtle tac0turtle merged commit 4151a58 into release/v0.47.x Mar 20, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-15462 branch March 20, 2023 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/distribution distribution module related
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants