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

Sanitize preflight (bp #11373) #11376

Merged
merged 4 commits into from
Aug 5, 2020
Merged

Sanitize preflight (bp #11373) #11376

merged 4 commits into from
Aug 5, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2020

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

Cherry-pick of 3f73aff has failed:

On branch mergify/bp/v1.2/pr-11373
Your branch is ahead of 'origin/v1.2' by 1 commit.
  (use "git push" to publish your local commits)

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

Changes to be committed:

	modified:   runtime/src/accounts.rs

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

	both modified:   sdk/src/transaction.rs

Cherry-pick of 14339de has failed:

On branch mergify/bp/v1.2/pr-11373
Your branch is ahead of 'origin/v1.2' by 3 commits.
  (use "git push" to publish your local commits)

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

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

	both modified:   core/src/rpc.rs

no changes added to commit (use "git add" and/or "git commit -a")

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 Aug 5, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 5, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 5, 2020
@t-nelson t-nelson force-pushed the mergify/bp/v1.2/pr-11373 branch from 900ad3e to b0aa088 Compare August 5, 2020 14:43
@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 Aug 5, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 5, 2020

automerge label removed due to a CI failure

@t-nelson t-nelson force-pushed the mergify/bp/v1.2/pr-11373 branch from b0aa088 to 6972fb4 Compare August 5, 2020 15:39
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 5, 2020
@codecov
Copy link

codecov bot commented Aug 5, 2020

Codecov Report

Merging #11376 into v1.2 will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@          Coverage Diff           @@
##            v1.2   #11376   +/-   ##
======================================
  Coverage   82.2%    82.2%           
======================================
  Files        310      310           
  Lines      74628    74640   +12     
======================================
+ Hits       61369    61399   +30     
+ Misses     13259    13241   -18     

@mergify mergify bot merged commit 7b8e5a9 into v1.2 Aug 5, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-11373 branch August 5, 2020 17:03
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