Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Bump spl-token to v3.1.1 (backport #17951) #17958

Merged
merged 2 commits into from
Jun 15, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 15, 2021

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

On branch mergify/bp/v1.7/pr-17951
Your branch is up to date with 'origin/v1.7'.

You are currently cherry-picking commit b7de36999.
  (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:   transaction-status/Cargo.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   account-decoder/Cargo.toml
	both modified:   accounts-cluster-bench/Cargo.toml
	both modified:   programs/bpf/Cargo.lock
	both modified:   rpc/Cargo.toml
	both modified:   tokens/Cargo.toml

To fix up this pull request, you can check it out 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/

(cherry picked from commit b7de369)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	accounts-cluster-bench/Cargo.toml
#	programs/bpf/Cargo.lock
#	rpc/Cargo.toml
#	tokens/Cargo.toml
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jun 15, 2021
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 15, 2021
@CriesofCarrots CriesofCarrots added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Jun 15, 2021
@codecov
Copy link

codecov bot commented Jun 15, 2021

Codecov Report

Merging #17958 (c6c97b2) into v1.7 (d6f1751) will decrease coverage by 0.0%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             v1.7   #17958     +/-   ##
=========================================
- Coverage    82.4%    82.4%   -0.1%     
=========================================
  Files         428      428             
  Lines      120230   120230             
=========================================
- Hits        99172    99162     -10     
- Misses      21058    21068     +10     

@mergify mergify bot merged commit 991f99b into v1.7 Jun 15, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17951 branch June 15, 2021 08:30
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants