Merge PR #1178: Merge master (Tendermint updates)

* update to tm v0.19.6
* update tm to 0.17.4
* update for tm v0.19.9
* update godep
This commit is contained in:
Ethan Buchman
2018-06-09 06:34:27 +02:00
committed by Christopher Goes
parent 0b9751ac98
commit a277ba91c7
7 changed files with 37 additions and 18 deletions
+1 -1
View File
@@ -26,7 +26,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"