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

Ensure that the spl-token 2 native mint account is owned by the spl-token 2 program (bp #11966) #11973

Merged
merged 1 commit into from
Sep 1, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 1, 2020

This is an automated backport of pull request #11966 done by Mergify

Cherry-pick of 7341e60 has failed:

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

You are currently cherry-picking commit 7341e6004.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   core/src/non_circulating_supply.rs
	modified:   core/src/rpc.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   core/src/rpc_service.rs
	both modified:   runtime/src/bank.rs

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 simulator.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the conflicts label Sep 1, 2020
@mvines mvines force-pushed the mergify/bp/v1.2/pr-11966 branch from 4e366ac to 2a6a33e Compare September 1, 2020 17:51
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 1, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Sep 1, 2020

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Sep 1, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Sep 1, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Sep 1, 2020
@mvines mvines force-pushed the mergify/bp/v1.2/pr-11966 branch from 2a6a33e to ec8a475 Compare September 1, 2020 18:06
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 1, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Sep 1, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Sep 1, 2020
…oken 2 program.

Workaround for solana-labs/solana-program-library#374 until spl-token 3 is shipped

(cherry picked from commit 7341e60)
@mvines mvines force-pushed the mergify/bp/v1.2/pr-11966 branch from ec8a475 to aeb55aa Compare September 1, 2020 18:17
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 1, 2020
@codecov
Copy link

codecov bot commented Sep 1, 2020

Codecov Report

Merging #11973 into v1.2 will increase coverage by 0.1%.
The diff coverage is 85.7%.

@@           Coverage Diff            @@
##            v1.2   #11973     +/-   ##
========================================
+ Coverage   81.9%    82.0%   +0.1%     
========================================
  Files        307      321     +14     
  Lines      71798    77119   +5321     
========================================
+ Hits       58836    63281   +4445     
- Misses     12962    13838    +876     

@mergify mergify bot merged commit 42017eb into v1.2 Sep 1, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-11966 branch September 1, 2020 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant