Chore: Merge master to develop #4655
Merged
+7
−9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix:modified typo "environment"
Fix/remove needless asserts
docs: add correct repo for cloning instructions
kantai
commented
Apr 8, 2024
Comment on lines
-252
to
+254
| // interleaved DB write? | ||
| return Err(net_error::Transient( | ||
| "Interleaved DB write has led to an inconsistent view of the stackerdb. Try again." | ||
| .into(), | ||
| )); | ||
| let msg = format!("Local slot versions ({}) out of sync with DB slot versions ({}); abandoning sync and trying again", local_slot_versions.len(), local_write_timestamps.len()); | ||
| warn!("{}", &msg); | ||
| return Err(net_error::Transient(msg)); |
There was a problem hiding this comment.
@jcnelson can you confirm that the master versions of the stackerdb::sync changes should be preferred here?
jcnelson
approved these changes
Apr 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This just merges the latest changes from master to develop.