Skip to content

Commit

Permalink
Merge pull request #1147 from cosmos/release/v0.17.5
Browse files Browse the repository at this point in the history
update for tm v0.19.9
  • Loading branch information
ebuchman authored Jun 6, 2018
2 parents 19a3290 + f3f2729 commit cf46be2
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 17 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 0.17.5

*June 5, 2018*

Update to Tendermint v0.19.9 (Fix evidence reactor, mempool deadlock, WAL panic,
memory leak)

## 0.17.4

*May 31, 2018*
Expand Down
18 changes: 9 additions & 9 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@

[[constraint]]
name = "github.com/tendermint/tendermint"
version = "0.19.7-rc0"
version = "0.19.9-rc0"

[[override]]
name = "github.com/tendermint/tmlibs"
version = "~0.8.3-rc0"
version = "~0.8.4"

# this got updated and broke, so locked to an old working commit ...
[[override]]
Expand Down
2 changes: 1 addition & 1 deletion client/lcd/lcd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
ctypes "github.com/tendermint/tendermint/rpc/core/types"
tmrpc "github.com/tendermint/tendermint/rpc/lib/server"
tmtypes "github.com/tendermint/tendermint/types"
pvm "github.com/tendermint/tendermint/types/priv_validator"
pvm "github.com/tendermint/tendermint/privval"
"github.com/tendermint/tmlibs/cli"
dbm "github.com/tendermint/tmlibs/db"
"github.com/tendermint/tmlibs/log"
Expand Down
2 changes: 1 addition & 1 deletion server/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
cfg "github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/p2p"
tmtypes "github.com/tendermint/tendermint/types"
pvm "github.com/tendermint/tendermint/types/priv_validator"
pvm "github.com/tendermint/tendermint/privval"
tmcli "github.com/tendermint/tmlibs/cli"
cmn "github.com/tendermint/tmlibs/common"
dbm "github.com/tendermint/tmlibs/db"
Expand Down
2 changes: 1 addition & 1 deletion server/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
"github.com/tendermint/tendermint/node"
"github.com/tendermint/tendermint/proxy"
pvm "github.com/tendermint/tendermint/types/priv_validator"
pvm "github.com/tendermint/tendermint/privval"
cmn "github.com/tendermint/tmlibs/common"
)

Expand Down
2 changes: 1 addition & 1 deletion server/tm_cmds.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
"github.com/tendermint/tendermint/p2p"
pvm "github.com/tendermint/tendermint/types/priv_validator"
pvm "github.com/tendermint/tendermint/privval"
)

// ShowNodeIDCmd - ported from Tendermint, dump node ID to stdout
Expand Down
4 changes: 2 additions & 2 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package version

const Maj = "0"
const Min = "17"
const Fix = "4"
const Fix = "5"

const Version = "0.17.4"
const Version = "0.17.5"

// GitCommit set by build flags
var GitCommit = ""

0 comments on commit cf46be2

Please sign in to comment.