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

Merge branch 'master' into develop

This commit is contained in:
Ethan Buchman 2018-04-29 23:47:17 -04:00
parent 71dccd4db3 0fb189777c
commit b79ab072e7
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,6 +1,12 @@
# Changelog # Changelog
## 0.15.0 (TBD) ## 0.15.1 (April 29, 2018)
IMPROVEMENTS:
* Update Tendermint to v0.19.1 (includes many rpc fixes)
## 0.15.0 (April 29, 2018)
FEATURES: FEATURES:

24
Gopkg.lock generated
View File

@ -11,7 +11,7 @@
branch = "master" branch = "master"
name = "github.com/btcsuite/btcd" name = "github.com/btcsuite/btcd"
packages = ["btcec"] packages = ["btcec"]
revision = "2be2f12b358dc57d70b8f501b00be450192efbc3" revision = "675abc5df3c5531bc741b56a765e35623459da6d"
[[projects]] [[projects]]
name = "github.com/davecgh/go-spew" name = "github.com/davecgh/go-spew"
@ -277,8 +277,8 @@
[[projects]] [[projects]]
name = "github.com/tendermint/go-amino" name = "github.com/tendermint/go-amino"
packages = ["."] packages = ["."]
revision = "42246108ff925a457fb709475070a03dfd3e2b5c" revision = "3668c02a8feace009f80754a5e5a8541e5d7b996"
version = "0.9.6" version = "0.9.8"
[[projects]] [[projects]]
name = "github.com/tendermint/go-crypto" name = "github.com/tendermint/go-crypto"
@ -342,8 +342,8 @@
"types/priv_validator", "types/priv_validator",
"version" "version"
] ]
revision = "a2930cd7233f04f5a651020669289296545e70dc" revision = "26f633ed48441f72895b710f0e87b7b6c6791066"
version = "v0.19.0" version = "v0.19.1"
[[projects]] [[projects]]
name = "github.com/tendermint/tmlibs" name = "github.com/tendermint/tmlibs"
@ -360,8 +360,8 @@
"pubsub", "pubsub",
"pubsub/query" "pubsub/query"
] ]
revision = "737154202faf75c70437f59ba5303f2eb09f5636" revision = "d94e312673e16a11ea55d742cefb3e331228f898"
version = "0.8.2-rc1" version = "v0.8.2"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -377,7 +377,7 @@
"ripemd160", "ripemd160",
"salsa20/salsa" "salsa20/salsa"
] ]
revision = "d6449816ce06963d9d136eee5a56fca5b0616e7e" revision = "b49d69b5da943f7ef3c9cf91c8777c1f78a0cc3c"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -392,13 +392,13 @@
"lex/httplex", "lex/httplex",
"trace" "trace"
] ]
revision = "8d16fa6dc9a85c1cd3ed24ad08ff21cf94f10888" revision = "5f9ae10d9af5b1c89ae6904293b14b064d4ada23"
[[projects]] [[projects]]
branch = "master" branch = "master"
name = "golang.org/x/sys" name = "golang.org/x/sys"
packages = ["unix"] packages = ["unix"]
revision = "b126b21c05a91c856b027c16779c12e3bf236954" revision = "cbbc999da32df943dac6cd71eb3ee39e1d7838b9"
[[projects]] [[projects]]
name = "golang.org/x/text" name = "golang.org/x/text"
@ -425,7 +425,7 @@
branch = "master" branch = "master"
name = "google.golang.org/genproto" name = "google.golang.org/genproto"
packages = ["googleapis/rpc/status"] packages = ["googleapis/rpc/status"]
revision = "7fd901a49ba6a7f87732eb344f6e3c5b19d1b200" revision = "86e600f69ee4704c6efbf6a2a40a5c10700e76c2"
[[projects]] [[projects]]
name = "google.golang.org/grpc" name = "google.golang.org/grpc"
@ -460,6 +460,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "b6b2d696a242e715ddb8b25c93b3c8f7e7cabc9292eab29dffe935eddbd35fb8" inputs-digest = "48f831a7ccc2c0fd3b790c16ca99ec864b89253d087ff4190d821c01c13e635a"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

4
Gopkg.toml
View File

@ -62,7 +62,7 @@
[[constraint]] [[constraint]]
name = "github.com/tendermint/go-amino" name = "github.com/tendermint/go-amino"
version = "~0.9.6" version = "~0.9.8"
[[constraint]] [[constraint]]
name = "github.com/tendermint/iavl" name = "github.com/tendermint/iavl"
@ -70,7 +70,7 @@
[[constraint]] [[constraint]]
name = "github.com/tendermint/tendermint" name = "github.com/tendermint/tendermint"
version = "0.19.0" version = "0.19.1"
[[override]] [[override]]
name = "github.com/tendermint/tmlibs" name = "github.com/tendermint/tmlibs"

4
version/version.go
View File

@ -7,9 +7,9 @@ package version
const Maj = "0" const Maj = "0"
const Min = "15" const Min = "15"
const Fix = "0" const Fix = "1"
const Version = "0.15.0-rc0" const Version = "0.15.1"
// GitCommit set by build flags // GitCommit set by build flags
var GitCommit = "" var GitCommit = ""