Skip to content

fixed merge conflict issue#371

Merged
andynog merged 2 commits intov0.34.xfrom
andy/fix-v034-docs-merge
Feb 23, 2023
Merged

fixed merge conflict issue#371
andynog merged 2 commits intov0.34.xfrom
andy/fix-v034-docs-merge

Conversation

@andynog
Copy link
Collaborator

@andynog andynog commented Feb 22, 2023

just a quick fix for a merge conflict that was not fixed.


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

@andynog andynog added the documentation Improvements or additions to documentation label Feb 22, 2023
@andynog andynog self-assigned this Feb 22, 2023
@andynog andynog requested a review from a team as a code owner February 22, 2023 22:22
@lasarojc
Copy link
Contributor

Thanks for fixing these!

@andynog andynog merged commit eb05c16 into v0.34.x Feb 23, 2023
@andynog andynog deleted the andy/fix-v034-docs-merge branch February 23, 2023 20:26
cason pushed a commit that referenced this pull request Jan 5, 2024
* PBTS: second version of system model

* PBTS: new model referred in algorithm spec

* PBTS: removed model discussion from algorithm spec

* PBTS: corrections on the ystem model

* PBTS: a pretty complex problem statement

* PBTS: minor fixes on the problem spefication

* PBTS: liveness part of problem specification

* PBTS: link updated, outdated note on sysmodel_v1

* Update spec/consensus/proposer-based-timestamp/pbts-algorithm_002_draft.md

Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com>

* Apply William's suggestions from code review

Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com>

* PBTS: new discussion and definition for accuracy

* Apply Josef's suggestion from code review

Co-authored-by: Josef Widder <44643235+josef-widder@users.noreply.github.com>

* PBTS: some tags added to sysmodel

* PBTS: motivation and link to Issue #371

* PBTS: fixing lint error

Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com>
Co-authored-by: Josef Widder <44643235+josef-widder@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants