OSDN Git Service

Merge dev branch
authorYahtoo Ma <yahtoo.ma@gmail.com>
Thu, 30 Aug 2018 10:35:43 +0000 (18:35 +0800)
committerYahtoo Ma <yahtoo.ma@gmail.com>
Thu, 30 Aug 2018 10:35:43 +0000 (18:35 +0800)
commit5896a304f1631f3c96ce463daafe7b9c49e29428
tree75ca2593deb86b7660dbdabbb246f49f506751bb
parent3f9d0f39c0d14d555ebced1fd1648cade2547131
Merge dev branch
30 files changed:
account/accounts_test.go
api/errors.go
api/nodeinfo.go
asset/builder.go
blockchain/pseudohsm/pseudohsm.go
blockchain/signers/signers.go
blockchain/txbuilder/finalize.go
cmd/bytomcli/commands/asset.go
consensus/general.go
dashboard/dashboard.go
netsync/handle.go
p2p/node_info.go
p2p/switch.go
protocol/bc/types/merkle.go
protocol/bc/types/merkle_test.go
test/block_test.go
test/block_test_util.go
test/chain_test_util.go
test/mock/chain.go
vendor/github.com/hashicorp/go-version/.travis.yml [new file with mode: 0644]
vendor/github.com/hashicorp/go-version/LICENSE [new file with mode: 0644]
vendor/github.com/hashicorp/go-version/README.md [new file with mode: 0644]
vendor/github.com/hashicorp/go-version/constraint.go [new file with mode: 0644]
vendor/github.com/hashicorp/go-version/constraint_test.go [new file with mode: 0644]
vendor/github.com/hashicorp/go-version/version.go [new file with mode: 0644]
vendor/github.com/hashicorp/go-version/version_collection.go [new file with mode: 0644]
vendor/github.com/hashicorp/go-version/version_collection_test.go [new file with mode: 0644]
vendor/github.com/hashicorp/go-version/version_test.go [new file with mode: 0644]
version/version.go
version/version_test.go [new file with mode: 0644]