Skip to content
New issue

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

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

Already on GitHub? # to your account

avoid collision between names in Voting.v and Paxos.v #356

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Conversation

palmskog
Copy link
Contributor

@palmskog palmskog commented Dec 8, 2023

This is to allow people to Import both Voting and Paxos and allow names to be unique. I also uniformized some VLSM-related names and annotations.

theories/Examples/Paxos/Voting.v Outdated Show resolved Hide resolved
theories/Examples/Paxos/Voting.v Show resolved Hide resolved
theories/Examples/Paxos/Paxos.v Outdated Show resolved Hide resolved
theories/Examples/Paxos/Paxos.v Outdated Show resolved Hide resolved
theories/Examples/Paxos/Paxos.v Outdated Show resolved Hide resolved
theories/Examples/Paxos/Paxos.v Outdated Show resolved Hide resolved
theories/Examples/Paxos/Paxos.v Outdated Show resolved Hide resolved
palmskog and others added 3 commits December 8, 2023 18:55
… prefix, uniformize some Paxos-related VLSM names
Co-authored-by: Wojciech Kołowski <wkolowski@protonmail.com>
@palmskog
Copy link
Contributor Author

palmskog commented Dec 8, 2023

@bmmoore are you OK with merging this?

Copy link
Contributor

@bmmoore bmmoore left a comment

Choose a reason for hiding this comment

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

The new names are fine

@palmskog palmskog merged commit e029cb1 into master Dec 11, 2023
3 checks passed
@palmskog palmskog deleted the prefix-paxos branch December 11, 2023 08:41
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants