Skip to content

return back initially allowed level if we encounter allowed key#2889

Merged
ebuchman merged 2 commits intodevelopfrom
2868-module-main-overrides-everything
Nov 26, 2018
Merged

return back initially allowed level if we encounter allowed key#2889
ebuchman merged 2 commits intodevelopfrom
2868-module-main-overrides-everything

Conversation

@melekes
Copy link
Contributor

@melekes melekes commented Nov 20, 2018

Fixes #2868 where module=main setting overrides all others

  • Updated all relevant documentation in docs
  • Updated all code comments where relevant
  • Wrote tests
  • Updated CHANGELOG_PENDING.md

@melekes melekes requested a review from ebuchman as a code owner November 20, 2018 11:59
Fixes #2868 where module=main setting overrides all others
@melekes melekes force-pushed the 2868-module-main-overrides-everything branch from 20cfd7c to 3a509b1 Compare November 20, 2018 12:01
@codecov-io
Copy link

Codecov Report

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

@@            Coverage Diff             @@
##             develop    #2889   +/-   ##
==========================================
  Coverage           ?   62.18%           
==========================================
  Files              ?      212           
  Lines              ?    17310           
  Branches           ?        0           
==========================================
  Hits               ?    10765           
  Misses             ?     5641           
  Partials           ?      904
Impacted Files Coverage Δ
libs/log/filter.go 71.79% <71.42%> (ø)

@ebuchman ebuchman merged commit 98e442a into develop Nov 26, 2018
@ebuchman ebuchman deleted the 2868-module-main-overrides-everything branch November 26, 2018 04:34
danil-lashin pushed a commit to danil-lashin/tendermint that referenced this pull request Nov 27, 2018
* develop:
  types: Emit tags from BeginBlock/EndBlock (tendermint#2747)
  Fix fast sync stack with wrong block tendermint#2457 (tendermint#2731)
  It's better read from genDoc than from state.validators when appHeight==0 in replay (tendermint#2893)
  update encoding spec (tendermint#2903)
  return back initially allowed level if we encounter allowed key (tendermint#2889)
  Handling integer IDs in JSON-RPC requests -- fixes tendermint#2366 (tendermint#2811)

# Conflicts:
#	blockchain/reactor_test.go
#	blockchain/store_test.go
#	node/node_test.go
#	types/events.go
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