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

remove dated cost checking feature (backport #29598) #29656

Merged
merged 3 commits into from
Jan 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 11, 2023

This is an automatic backport of pull request #29598 done by Mergify.
Cherry-pick of 3d63f93 has failed:

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

You are currently cherry-picking commit 3d63f93bb.
  (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:   sdk/src/feature_set.rs

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

(cherry picked from commit 3d63f93)

# Conflicts:
#	ledger/src/blockstore_processor.rs
@tao-stones tao-stones requested a review from steviez January 12, 2023 05:37
Copy link
Contributor

@steviez steviez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just the one nitpick; otherwise, LGTM

ledger/src/blockstore_processor.rs Outdated Show resolved Hide resolved
@tao-stones tao-stones added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Jan 12, 2023
@tao-stones tao-stones merged commit e7a57ca into v1.13 Jan 12, 2023
@tao-stones tao-stones deleted the mergify/bp/v1.13/pr-29598 branch January 12, 2023 19:12
t-nelson added a commit to t-nelson/solana that referenced this pull request Mar 14, 2023
t-nelson added a commit that referenced this pull request Mar 15, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants