-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Setup ReplayStage confirmation scaffolding for duplicate slots (bp #9698) #16119
Conversation
44c9dea
to
6cb47de
Compare
😱 New commits were pushed while the automerge label was present. |
Codecov Report
@@ 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 |
(cherry picked from commit 52703ba)
6cb47de
to
880182c
Compare
😱 New commits were pushed while the automerge label was present. |
There was a problem hiding this 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
&mut true, | ||
&mut Vec::new(), | ||
&mut BTreeMap::new(), |
There was a problem hiding this comment.
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
if let Some(transaction_status_sender) = transaction_status_sender.clone() { | ||
transaction_status_sender.send_transaction_status_freeze_message(&bank); | ||
} |
There was a problem hiding this comment.
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
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/