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

Nits for sanitize trait (bp #9741) #9809

Merged
merged 2 commits into from
Apr 30, 2020
Merged

Nits for sanitize trait (bp #9741) #9809

merged 2 commits into from
Apr 30, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 30, 2020

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

Cherry-pick of a0514eb has failed:

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

You are currently cherry-picking commit a0514eb2a.
  (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/cluster_info.rs
	modified:   core/src/contact_info.rs
	modified:   sdk/src/hash.rs
	modified:   sdk/src/instruction.rs
	modified:   sdk/src/message.rs

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

	both modified:   core/src/crds_value.rs
	deleted by us:   core/src/epoch_slots.rs
	both modified:   sdk/src/sanitize.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/

automerge

(cherry picked from commit a0514eb)

# Conflicts:
#	core/src/crds_value.rs
#	core/src/epoch_slots.rs
#	sdk/src/sanitize.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Apr 30, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 30, 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 Apr 30, 2020
@mvines mvines force-pushed the mergify/bp/v1.0/pr-9741 branch from d9aff98 to bb573ad Compare April 30, 2020 17:15
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 30, 2020
@solana-grimes
Copy link
Contributor

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

@mvines mvines force-pushed the mergify/bp/v1.0/pr-9741 branch from bb573ad to 7212ecc Compare April 30, 2020 19:10
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 30, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 30, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@codecov
Copy link

codecov bot commented Apr 30, 2020

Codecov Report

Merging #9809 into v1.0 will increase coverage by 0.0%.
The diff coverage is 51.8%.

@@          Coverage Diff          @@
##            v1.0   #9809   +/-   ##
=====================================
  Coverage   80.2%   80.2%           
=====================================
  Files        269     269           
  Lines      59499   59516   +17     
=====================================
+ Hits       47752   47789   +37     
+ Misses     11747   11727   -20     

@mvines mvines merged commit 5bc57ea into v1.0 Apr 30, 2020
@mergify mergify bot deleted the mergify/bp/v1.0/pr-9741 branch April 30, 2020 21:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants