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 master back to develop for 0.23.0 release #1830

Closed
wants to merge 26 commits into from
Closed

Conversation

jaekwon
Copy link
Contributor

@jaekwon jaekwon commented Jul 26, 2018

  • Linked to github-issue with discussion and accepted design
  • Updated all relevant documentation (docs/)
  • Updated all relevant code comments
  • Wrote tests
  • Added entries in PENDING.md
  • Updated cmd/gaia and examples/

For Admin Use:

  • Added appropriate labels to PR (ex. wip, ready-for-review, docs)
  • Reviewers Assigned
  • Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

cwgoes and others added 20 commits July 19, 2018 21:15
This subverts the really hard to decipher ABCI error message, with
a nice user friendly error message.
* Update to tendermint v0.22.6

- This was cherry-picked and fixed from develop
- Updates all crypto imports for changes from v0.22.5
slashing for downtime is 10%
* Avoid slashing & revoking no longer stored or already revoked validators for downtime
* Add testcase
* Update PENDING.md
* add revoked to human-readable validator
* changelog
* added failing test
* add intra-tx counter to the genesis validators
* changelog
* fixed proposaltype string bug
@codecov
Copy link

codecov bot commented Jul 26, 2018

Codecov Report

❗ No coverage uploaded for pull request base (develop@5d02a74). Click here to learn what that means.
The diff coverage is 63.63%.

@@            Coverage Diff             @@
##             develop    #1830   +/-   ##
==========================================
  Coverage           ?   60.63%           
==========================================
  Files              ?      119           
  Lines              ?     6917           
  Branches           ?        0           
==========================================
  Hits               ?     4194           
  Misses             ?     2484           
  Partials           ?      239

ebuchman and others added 4 commits July 26, 2018 01:10
* deprecate gaia testnets dir for testnets repo

* update docs for gaia-7002
* Tendermint 0.22.7; bump patch version

* 0.23.0 -> 0.23.1; update CHANGELOG.md
@jaekwon jaekwon changed the title WIP: merge master back to develop for 0.23.0 release Merge master back to develop for 0.23.0 release Jul 27, 2018
@ebuchman ebuchman mentioned this pull request Aug 8, 2018
6 tasks
* docs: updates for 7002

* docs: use master instead of versions

* Update validator-setup.md

* 7002 -> 7005
@zmanian zmanian mentioned this pull request Aug 10, 2018
9 tasks
@ValarDragon
Copy link
Contributor

We probably need to make a new base-branch here, for syncing master and develop, since we don't want to rebase or merge develop into master.

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.

7 participants