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

Permit paying oneself (bp #10337) #10341

Merged
merged 1 commit into from
May 31, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 31, 2020

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

Cherry-pick of 5d248fe has failed:

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

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

Changes to be committed:

	modified:   cli/src/cli.rs
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/bank.rs

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

	both modified:   runtime/src/system_instruction_processor.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 conflicts automerge Merge this Pull Request automatically once CI passes labels May 31, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label May 31, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 31, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label May 31, 2020
* Allow paying to oneself

* cargo fmt

* Permit pay-to-self in CLI

No test here because we're just removing an [untested] special case.

Fixes #10339

(cherry picked from commit 5d248fe)
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 31, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label May 31, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 31, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label May 31, 2020
@codecov
Copy link

codecov bot commented May 31, 2020

Codecov Report

Merging #10341 into v1.1 will decrease coverage by 0.0%.
The diff coverage is 98.3%.

@@           Coverage Diff            @@
##            v1.1   #10341     +/-   ##
========================================
- Coverage   80.7%    80.7%   -0.1%     
========================================
  Files        288      288             
  Lines      66713    66714      +1     
========================================
- Hits       53861    53852      -9     
- Misses     12852    12862     +10     

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 31, 2020
@solana-grimes solana-grimes merged commit 640bb9c into v1.1 May 31, 2020
@mergify mergify bot deleted the mergify/bp/v1.1/pr-10337 branch May 31, 2020 20:19
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.

2 participants