certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update godep

This commit is contained in:
Ethan Buchman 2018-06-08 21:34:26 -07:00
parent 2913d14239
commit 5ddcf23aca
2 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Gopkg.lock generated
View File

@ -256,7 +256,7 @@
"leveldb/table", "leveldb/table",
"leveldb/util" "leveldb/util"
] ]
revision = "5d6fca44a948d2be89a9702de7717f0168403d3d" revision = "e2150783cd35f5b607daca48afd8c57ec54cc995"
[[projects]] [[projects]]
name = "github.com/tendermint/abci" name = "github.com/tendermint/abci"
@ -267,8 +267,8 @@
"server", "server",
"types" "types"
] ]
revision = "9af8b7a7c87478869f8c280ed9539470b8f470b4" revision = "ebee2fe114020aa49c70bbbae50b7079fc7e7b90"
version = "v0.11.0-rc4" version = "v0.11.0"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -347,13 +347,8 @@
"types", "types",
"version" "version"
] ]
<<<<<<< HEAD revision = "27bd1deabe4ba6a2d9b463b8f3e3f1e31b993e61"
revision = "b5baab0238c9ec26e3b2d229b0243f9ff9220bdb" version = "v0.20.0"
version = "v0.20.0-rc3"
=======
revision = "775fef31c2b8fb7ea36f0d57bae3bfa74d353100"
version = "v0.19.9-rc0"
>>>>>>> master
[[projects]] [[projects]]
branch = "develop" branch = "develop"
@ -368,17 +363,10 @@
"db", "db",
"flowrate", "flowrate",
"log", "log",
<<<<<<< HEAD
"merkle", "merkle",
"merkle/tmhash" "merkle/tmhash"
] ]
revision = "44f1bdb0d55cc6527e38d0a7aab406e2580f56a4" revision = "640af0205d98d1f45fb2f912f9c35c8bf816adc9"
=======
"merkle"
]
revision = "692f1d86a6e2c0efa698fd1e4541b68c74ffaf38"
version = "v0.8.4"
>>>>>>> master
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -394,11 +382,7 @@
"ripemd160", "ripemd160",
"salsa20/salsa" "salsa20/salsa"
] ]
<<<<<<< HEAD revision = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9"
revision = "5ba7f63082460102a45837dbd1827e10f9479ac0"
=======
revision = "78e79280f680f7dd6b8e48c751887111ebdbcbd8"
>>>>>>> master
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -418,7 +402,7 @@
branch = "master" branch = "master"
name = "golang.org/x/sys" name = "golang.org/x/sys"
packages = ["unix"] packages = ["unix"]
revision = "c11f84a56e43e20a78cee75a7c034031ecf57d1f" revision = "9527bec2660bd847c050fda93a0f0c6dee0800bb"
[[projects]] [[projects]]
name = "golang.org/x/text" name = "golang.org/x/text"
@ -479,10 +463,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
<<<<<<< HEAD inputs-digest = "31f69b235b2d8f879a215c9e8ca0919adc62d21f6830b17931a3a0efb058721f"
inputs-digest = "ccb2ab7644a38c2d0326280582f758256e37fc98c3ef0403581e3b85cff42188"
=======
inputs-digest = "71d11bd2a8f3f46ba3fd16759b501ad5b6b48037717d82020ebb25e021b67117"
>>>>>>> master
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

6
Gopkg.toml
View File

@ -54,7 +54,7 @@
[[constraint]] [[constraint]]
name = "github.com/tendermint/abci" name = "github.com/tendermint/abci"
version = "=0.11.0-rc4" version = "=0.11.0"
[[constraint]] [[constraint]]
name = "github.com/tendermint/go-crypto" name = "github.com/tendermint/go-crypto"
@ -76,10 +76,6 @@
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"