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.

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

merge linemint for initial ebony #197

Closed
wants to merge 6 commits into from
Closed

Conversation

egonspace
Copy link
Contributor

Closes: #XXX
ebony branch is derived from tendermint origin/v0.34.x branch (after tag v0.34.8)

This first PR contains the works done for linemint v0.33.9-0.1.0

linemint v0.33.9-0.1.0 contains following based tendermint v0.33.9

To keep an eye out for what caused the merge conflicts, refer to the following tendermint PR to help you understand.

tendermint/tendermint@dc90cf6#diff-f71975385bf5bc21c04eb08f496140cc8cca405b8dbd7b628342e6d8afb61cc5

tendermint/tendermint@8a1404b#diff-f71975385bf5bc21c04eb08f496140cc8cca405b8dbd7b628342e6d8afb61cc5

Description


For contributor use:

  • Wrote tests
  • Updated CHANGELOG_PENDING.md
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Updated relevant documentation (docs/) and code comments
  • Re-reviewed Files changed in the Github PR explorer

@egonspace egonspace self-assigned this Mar 8, 2021
@egonspace egonspace changed the title merge linemint merge linemint for initial ebony Mar 8, 2021
Copy link
Contributor

@wetcod wetcod left a comment

Choose a reason for hiding this comment

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

LGTM

@egonspace egonspace closed this Mar 9, 2021
@egonspace egonspace deleted the egon/merge_linemint branch March 9, 2021 03:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants