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

Setup ReplayStage confirmation scaffolding for duplicate slots (bp #9698) #16119

Merged
merged 1 commit into from
Mar 30, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2021

This is an automatic backport of pull request #9698 done by Mergify.


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.io/

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 25, 2021
@carllin carllin force-pushed the mergify/bp/v1.6/pr-9698 branch from 44c9dea to 6cb47de Compare March 25, 2021 08:09
@solana-grimes
Copy link
Contributor

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

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 25, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 29, 2021
@codecov
Copy link

codecov bot commented Mar 29, 2021

Codecov Report

Merging #16119 (880182c) into v1.6 (9fb749d) will increase coverage by 0.1%.
The diff coverage is 89.4%.

@@            Coverage Diff            @@
##             v1.6   #16119     +/-   ##
=========================================
+ Coverage    79.8%    80.0%   +0.1%     
=========================================
  Files         409      410      +1     
  Lines      107963   109009   +1046     
=========================================
+ Hits        86246    87211    +965     
- Misses      21717    21798     +81     

@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-9698 branch from 6cb47de to 880182c Compare March 30, 2021 02:40
@solana-grimes
Copy link
Contributor

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

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 30, 2021
Copy link
Contributor

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

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

@carllin overview of conflict resolution below

Comment on lines 1457 to +1459
&mut true,
&mut Vec::new(),
&mut BTreeMap::new(),
Copy link
Contributor

Choose a reason for hiding this comment

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

This new BTreeMap friend comes after bool and Vec friends now. Plumbed like this throughout

Comment on lines -1436 to -1438
if let Some(transaction_status_sender) = transaction_status_sender.clone() {
transaction_status_sender.send_transaction_status_freeze_message(&bank);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

This if-statement wasn't in the original delete block, so I added it to the addition block below

@t-nelson t-nelson merged commit cc5565b into v1.6 Mar 30, 2021
@t-nelson t-nelson deleted the mergify/bp/v1.6/pr-9698 branch March 30, 2021 04:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants