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 base account getter (backport #12154) #12161

Merged
merged 2 commits into from
Jun 6, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2022

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

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

You are currently cherry-picking commit a39be7b78.
  (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/auth/vesting/msg_server.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 a39be7b)

# Conflicts:
#	CHANGELOG.md
@tac0turtle tac0turtle merged commit 008d10d into release/v0.45.x Jun 6, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-12154 branch June 6, 2022 20:27
alexanderbez added a commit that referenced this pull request Jun 9, 2022
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
* fix: add base account getter (cosmos#12154)

(cherry picked from commit a39be7b)

# Conflicts:
#	CHANGELOG.md

* fix conflict

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
* fix: add base account getter (cosmos#12154)

(cherry picked from commit a39be7b)

* fix conflict

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
* fix: add base account getter (cosmos#12154)

(cherry picked from commit a39be7b)

# Conflicts:
#	CHANGELOG.md

* fix conflict

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants