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

remove index hash calculation as an option (backport #23928) #23967

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2022

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

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

You are currently cherry-picking commit c24de1727.
  (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/tvu.rs
	modified:   core/src/validator.rs
	modified:   core/tests/snapshots.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   local-cluster/src/validator_configs.rs
	modified:   runtime/src/accounts_background_service.rs
	modified:   runtime/src/snapshot_config.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   validator/src/main.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

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Mar 28, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Mar 28, 2022

automerge label removed due to a CI failure

@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 Mar 29, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Mar 29, 2022

automerge label removed due to a CI failure

(cherry picked from commit c24de17)

# Conflicts:
#	validator/src/main.rs
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.10/pr-23928 branch from 746dbf2 to 15fd3ff Compare March 29, 2022 15:48
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 29, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Mar 29, 2022

automerge label removed due to a CI failure

@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 Mar 29, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Mar 29, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 29, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Mar 29, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Mar 29, 2022
@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 Mar 29, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Mar 29, 2022

automerge label removed due to a CI failure

@stale
Copy link

stale bot commented Apr 16, 2022

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@stale stale bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Apr 16, 2022
@stale
Copy link

stale bot commented Apr 27, 2022

This stale pull request has been automatically closed. Thank you for your contributions.

@stale stale bot closed this Apr 27, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-23928 branch April 27, 2022 23:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts stale [bot only] Added to stale content; results in auto-close after a week.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant