Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

v1.17: Add feature flag for LastIndex and Erasure duplicate proofs (backport of #34360) #34541

Merged
merged 2 commits into from
Dec 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2023

This is an automatic backport of pull request #34360 done by Mergify.
Cherry-pick of def3bc4 has failed:

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

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

Changes to be committed:
	modified:   core/src/window_service.rs
	modified:   turbine/src/cluster_nodes.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/feature_set.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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 config editor.

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

* Add feature flag for LastIndex and Erasure duplicate proofs

* pr feedback: use root bank instead of 2 params

* pr feedback: & instead of &Arc

* pr feedback: reuse fn, remove redundant clones

* rebase: fix feature set conflict

(cherry picked from commit def3bc4)

# Conflicts:
#	sdk/src/feature_set.rs
@mergify mergify bot added conflicts feature-gate Pull Request adds or modifies a runtime feature gate labels Dec 20, 2023
Copy link

codecov bot commented Dec 20, 2023

Codecov Report

Attention: 8 lines in your changes are missing coverage. Please review.

Comparison is base (907b904) 81.8% compared to head (1bd8d4a) 81.8%.

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17   #34541   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         803      803           
  Lines      218209   218231   +22     
=======================================
+ Hits       178523   178549   +26     
+ Misses      39686    39682    -4     

@AshwinSekar AshwinSekar merged commit b9aaedb into v1.17 Dec 20, 2023
17 checks passed
@AshwinSekar AshwinSekar deleted the mergify/bp/v1.17/pr-34360 branch December 20, 2023 19:21
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts feature-gate Pull Request adds or modifies a runtime feature gate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants