Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix multiple keys referencing the same merge #2309

Merged
merged 3 commits into from
Oct 11, 2019
Merged

Fix multiple keys referencing the same merge #2309

merged 3 commits into from
Oct 11, 2019

Conversation

marta-lokhova
Copy link
Contributor

This should resolve #2299, as we don't rely on maxProtocolVersion for merge uniqueness anymore.

@marta-lokhova marta-lokhova requested a review from graydon October 8, 2019 17:56
@MonsieurNicolas
Copy link
Contributor

r+ 7fecb9a

latobarita added a commit that referenced this pull request Oct 11, 2019
@latobarita
Merge pull request #2309 from marta-lokhova/merge_key_race
80f5998 
Fix multiple keys referencing the same merge

Reviewed-by: MonsieurNicolas
@latobarita latobarita merged commit 7fecb9a into stellar:master Oct 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@graydon graydon Awaiting requested review from graydon

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Same merges produce different mergeKeys, causing merge races
3 participants
@marta-lokhova @MonsieurNicolas @latobarita