Merge branch 'master' into develop
This commit is contained in:
commit
2913d14239
19
CHANGELOG.md
19
CHANGELOG.md
|
@ -85,6 +85,25 @@ BUG FIXES
|
||||||
^ this is important for unbonded validators in the power store!
|
^ this is important for unbonded validators in the power store!
|
||||||
* [docs] Downgraded Swagger to v2 for downstream compatibility
|
* [docs] Downgraded Swagger to v2 for downstream compatibility
|
||||||
|
|
||||||
|
## 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*
|
||||||
|
|
||||||
|
Update to Tendermint v0.19.7 (WAL fixes and more)
|
||||||
|
|
||||||
|
## 0.17.3
|
||||||
|
|
||||||
|
*May 29, 2018*
|
||||||
|
|
||||||
|
Update to Tendermint v0.19.6 (fix fast-sync halt)
|
||||||
|
|
||||||
## 0.17.2
|
## 0.17.2
|
||||||
|
|
||||||
_May 20, 2018_
|
_May 20, 2018_
|
||||||
|
|
|
@ -170,8 +170,8 @@
|
||||||
[[projects]]
|
[[projects]]
|
||||||
name = "github.com/pelletier/go-toml"
|
name = "github.com/pelletier/go-toml"
|
||||||
packages = ["."]
|
packages = ["."]
|
||||||
revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
|
revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
|
||||||
version = "v1.1.0"
|
version = "v1.2.0"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
name = "github.com/pkg/errors"
|
name = "github.com/pkg/errors"
|
||||||
|
@ -330,6 +330,7 @@
|
||||||
"p2p/conn",
|
"p2p/conn",
|
||||||
"p2p/pex",
|
"p2p/pex",
|
||||||
"p2p/upnp",
|
"p2p/upnp",
|
||||||
|
"privval",
|
||||||
"proxy",
|
"proxy",
|
||||||
"rpc/client",
|
"rpc/client",
|
||||||
"rpc/core",
|
"rpc/core",
|
||||||
|
@ -344,11 +345,15 @@
|
||||||
"state/txindex/kv",
|
"state/txindex/kv",
|
||||||
"state/txindex/null",
|
"state/txindex/null",
|
||||||
"types",
|
"types",
|
||||||
"types/priv_validator",
|
|
||||||
"version"
|
"version"
|
||||||
]
|
]
|
||||||
|
<<<<<<< HEAD
|
||||||
revision = "b5baab0238c9ec26e3b2d229b0243f9ff9220bdb"
|
revision = "b5baab0238c9ec26e3b2d229b0243f9ff9220bdb"
|
||||||
version = "v0.20.0-rc3"
|
version = "v0.20.0-rc3"
|
||||||
|
=======
|
||||||
|
revision = "775fef31c2b8fb7ea36f0d57bae3bfa74d353100"
|
||||||
|
version = "v0.19.9-rc0"
|
||||||
|
>>>>>>> master
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "develop"
|
branch = "develop"
|
||||||
|
@ -363,10 +368,17 @@
|
||||||
"db",
|
"db",
|
||||||
"flowrate",
|
"flowrate",
|
||||||
"log",
|
"log",
|
||||||
|
<<<<<<< HEAD
|
||||||
"merkle",
|
"merkle",
|
||||||
"merkle/tmhash"
|
"merkle/tmhash"
|
||||||
]
|
]
|
||||||
revision = "44f1bdb0d55cc6527e38d0a7aab406e2580f56a4"
|
revision = "44f1bdb0d55cc6527e38d0a7aab406e2580f56a4"
|
||||||
|
=======
|
||||||
|
"merkle"
|
||||||
|
]
|
||||||
|
revision = "692f1d86a6e2c0efa698fd1e4541b68c74ffaf38"
|
||||||
|
version = "v0.8.4"
|
||||||
|
>>>>>>> master
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "master"
|
branch = "master"
|
||||||
|
@ -382,7 +394,11 @@
|
||||||
"ripemd160",
|
"ripemd160",
|
||||||
"salsa20/salsa"
|
"salsa20/salsa"
|
||||||
]
|
]
|
||||||
|
<<<<<<< HEAD
|
||||||
revision = "5ba7f63082460102a45837dbd1827e10f9479ac0"
|
revision = "5ba7f63082460102a45837dbd1827e10f9479ac0"
|
||||||
|
=======
|
||||||
|
revision = "78e79280f680f7dd6b8e48c751887111ebdbcbd8"
|
||||||
|
>>>>>>> master
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "master"
|
branch = "master"
|
||||||
|
@ -463,6 +479,10 @@
|
||||||
[solve-meta]
|
[solve-meta]
|
||||||
analyzer-name = "dep"
|
analyzer-name = "dep"
|
||||||
analyzer-version = 1
|
analyzer-version = 1
|
||||||
|
<<<<<<< HEAD
|
||||||
inputs-digest = "ccb2ab7644a38c2d0326280582f758256e37fc98c3ef0403581e3b85cff42188"
|
inputs-digest = "ccb2ab7644a38c2d0326280582f758256e37fc98c3ef0403581e3b85cff42188"
|
||||||
|
=======
|
||||||
|
inputs-digest = "71d11bd2a8f3f46ba3fd16759b501ad5b6b48037717d82020ebb25e021b67117"
|
||||||
|
>>>>>>> master
|
||||||
solver-name = "gps-cdcl"
|
solver-name = "gps-cdcl"
|
||||||
solver-version = 1
|
solver-version = 1
|
||||||
|
|
|
@ -70,12 +70,16 @@
|
||||||
|
|
||||||
[[constraint]]
|
[[constraint]]
|
||||||
name = "github.com/tendermint/tendermint"
|
name = "github.com/tendermint/tendermint"
|
||||||
version = "=0.20.0-rc3"
|
version = "=0.20.0"
|
||||||
|
|
||||||
[[override]]
|
[[override]]
|
||||||
name = "github.com/tendermint/tmlibs"
|
name = "github.com/tendermint/tmlibs"
|
||||||
branch = "develop"
|
branch = "develop"
|
||||||
|
|
||||||
|
[[override]]
|
||||||
|
name = "github.com/tendermint/tmlibs"
|
||||||
|
version = "~0.8.4"
|
||||||
|
|
||||||
# this got updated and broke, so locked to an old working commit ...
|
# this got updated and broke, so locked to an old working commit ...
|
||||||
[[override]]
|
[[override]]
|
||||||
name = "google.golang.org/genproto"
|
name = "google.golang.org/genproto"
|
||||||
|
|
|
@ -26,7 +26,7 @@ import (
|
||||||
ctypes "github.com/tendermint/tendermint/rpc/core/types"
|
ctypes "github.com/tendermint/tendermint/rpc/core/types"
|
||||||
tmrpc "github.com/tendermint/tendermint/rpc/lib/server"
|
tmrpc "github.com/tendermint/tendermint/rpc/lib/server"
|
||||||
tmtypes "github.com/tendermint/tendermint/types"
|
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"
|
"github.com/tendermint/tmlibs/cli"
|
||||||
dbm "github.com/tendermint/tmlibs/db"
|
dbm "github.com/tendermint/tmlibs/db"
|
||||||
"github.com/tendermint/tmlibs/log"
|
"github.com/tendermint/tmlibs/log"
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
cfg "github.com/tendermint/tendermint/config"
|
cfg "github.com/tendermint/tendermint/config"
|
||||||
"github.com/tendermint/tendermint/p2p"
|
"github.com/tendermint/tendermint/p2p"
|
||||||
tmtypes "github.com/tendermint/tendermint/types"
|
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"
|
tmcli "github.com/tendermint/tmlibs/cli"
|
||||||
cmn "github.com/tendermint/tmlibs/common"
|
cmn "github.com/tendermint/tmlibs/common"
|
||||||
dbm "github.com/tendermint/tmlibs/db"
|
dbm "github.com/tendermint/tmlibs/db"
|
||||||
|
|
|
@ -10,7 +10,7 @@ import (
|
||||||
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
|
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
|
||||||
"github.com/tendermint/tendermint/node"
|
"github.com/tendermint/tendermint/node"
|
||||||
"github.com/tendermint/tendermint/proxy"
|
"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"
|
cmn "github.com/tendermint/tmlibs/common"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ import (
|
||||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||||
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
|
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
|
||||||
"github.com/tendermint/tendermint/p2p"
|
"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
|
// ShowNodeIDCmd - ported from Tendermint, dump node ID to stdout
|
||||||
|
|
Loading…
Reference in New Issue