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

Bitwise compress incomplete epoch slots (bp #8341) #8344

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 20, 2020

This is an automated backport of pull request #8341 done by Mergify.io

Cherry-pick of ea8d9d1 has failed:

On branch mergify/bp/v0.23/pr-8341
Your branch is up to date with 'origin/v0.23'.

You are currently cherry-picking commit ea8d9d1ae.
  (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/cluster_info.rs
	both modified:   core/src/crds_value.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 [documention](https://doc.mergify.io/).

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
  • @Mergifyio backports <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/

(cherry picked from commit ea8d9d1)

# Conflicts:
#	core/src/cluster_info.rs
#	core/src/crds_value.rs
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 20, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 20, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mvines
Copy link
Member

mvines commented Feb 20, 2020

Ouch, this conflicted pretty badly on 0.23. @pgarg66 - could you please resolve the conflicts here?

@pgarg66
Copy link
Contributor

pgarg66 commented Feb 20, 2020

Ouch, this conflicted pretty badly on 0.23. @pgarg66 - could you please resolve the conflicts here?

Yep, #8276 is a predecessor to this. I've backported that. Once that lands, I'll rebase it manually

@pgarg66
Copy link
Contributor

pgarg66 commented Feb 20, 2020

Cherry picking using #8347

@pgarg66 pgarg66 closed this Feb 20, 2020
@pgarg66 pgarg66 deleted the mergify/bp/v0.23/pr-8341 branch February 20, 2020 05:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants