Ethan Buchman f347143b3d Merge branch 'master' into develop ...

Conflicts:
	cmd/tendermint/flags.go
	glide.lock
	glide.yaml
	node/node.go
	rpc/core/routes.go
	version/version.go

2017-01-12 20:48:10 -05:00

..

types

AppendTx -> DeliverTx

2017-01-12 15:55:03 -05:00

abci.go

file name fixes

2017-01-12 16:17:43 -05:00

blocks.go

fixes from review

2016-12-12 14:12:37 -05:00

consensus.go

rpc: use interfaces for pipe

2016-10-14 21:38:49 -04:00

dev.go

rpc: use interfaces for pipe

2016-10-14 21:38:49 -04:00

events.go

type safe events

2016-10-10 03:10:29 -04:00

log.go

Refactor to move common libraries out of project

2015-10-22 17:39:06 -07:00

mempool.go

AppendTx -> DeliverTx

2017-01-12 15:55:03 -05:00

net.go

fixes from review

2016-12-12 14:12:37 -05:00

pipe.go

TMSP -> ABCI

2017-01-12 15:53:32 -05:00

routes.go

Merge branch 'master' into develop

2017-01-12 20:48:10 -05:00

status.go

rpc: use interfaces for pipe

2016-10-14 21:38:49 -04:00

version.go

bump rpc version; add consensus version

2016-04-19 20:45:33 -04:00