Commit Graph

6607 Commits

Author SHA1 Message Date
6526ab2137 Merge pull request #50 from tendermint/hotfix_make
Make sure we install before test, since test relies on counter etc
2017-01-13 13:17:24 -05:00
b9d1465488 Make sure we install before test, since test relies on counter etc 2017-01-13 10:12:38 -08:00
68ef6bc1bf update README 2017-01-13 03:17:53 -05:00
9123e63a33 more glide updates 2017-01-13 00:54:06 -05:00
ba7ca4f372 fix tests 2017-01-13 00:54:01 -05:00
699d45bc67 Merge pull request #48 from tendermint/develop
move glide deps to master
2017-01-13 00:26:36 -05:00
5626a1125a move glide deps to master 2017-01-13 00:24:38 -05:00
1e25e9f58f glide update for go-db test fix 2017-01-12 22:49:52 -05:00
72f6dacd22 fix tests 2017-01-12 22:32:20 -05:00
9b4660b458 version bump to 0.8.0 2017-01-12 22:07:55 -05:00
16a5c6b2c8 update all glide deps to master 2017-01-12 22:05:03 -05:00
068afb5b7f Merge pull request #36 from tendermint/develop
v0.3.0, for Tendermint v0.8.0
2017-01-12 22:03:00 -05:00
fcea0cda21 Merge pull request #6 from tendermint/develop
v0.6.0
2017-01-12 22:02:40 -05:00
6177eb8398 love you circley 2017-01-12 22:01:20 -05:00
ac443fa61f run tests from bash script 2017-01-12 21:59:02 -05:00
08f2b5bc84 get deps for testing 2017-01-12 21:51:34 -05:00
b5ca28d60f Merge branch 'master' into develop
Conflicts:
	README.md
2017-01-12 21:44:09 -05:00
de56442660 Merge branch 'master' into develop 2017-01-12 21:40:43 -05:00
3d98f675f3 Merge pull request #11 from tendermint/develop
Develop
2017-01-12 21:39:57 -05:00
b27edfd189 Merge pull request #1 from tendermint/develop
Include pwd dir to StartProcess
2017-01-12 21:39:27 -05:00
fddee66d90 Merge pull request #8 from tendermint/develop
use mtx in OnStop
2017-01-12 21:38:04 -05:00
996c483f23 Merge pull request #4 from tendermint/develop
C LevelDB
2017-01-12 21:37:57 -05:00
e289af53b6 Merge pull request #6 from tendermint/develop
Develop
2017-01-12 21:37:18 -05:00
42b7bfbf0c update version and glide 2017-01-12 21:20:09 -05:00
67c9086b74 optional panic on AddPeer err 2017-01-12 21:09:24 -05:00
e47722ecb2 Connect2Switches: panic on err 2017-01-12 20:49:48 -05:00
2b750ea49f Make Connect2Switches blocking 2017-01-12 20:49:48 -05:00
58e42397f8 close conns on filter; fix order in MakeConnectedSwitch 2017-01-12 20:49:48 -05:00
bd353e004a QuitService->BaseService 2017-01-12 20:49:48 -05:00
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
c1952523cd update glide 2017-01-12 20:22:23 -05:00
1afe0cb45f test: always rebuild grpc_client 2017-01-12 18:45:41 -05:00
7075a8ed81 Merge pull request #365 from tendermint/rename
Rename
2017-01-12 16:41:52 -05:00
d83ca54b36 file name fixes 2017-01-12 16:17:43 -05:00
e0aead0be2 update glide 2017-01-12 16:12:41 -05:00
624dca61b3 Merge pull request #47 from tendermint/rename
Rename
2017-01-12 16:06:40 -05:00
5189a2248d TMSP -> ABCI 2017-01-12 16:04:32 -05:00
94b6dd65ee AppendTx -> DeliverTx 2017-01-12 15:55:03 -05:00
c147b41013 TMSP -> ABCI 2017-01-12 15:53:32 -05:00
3a55339114 Merge pull request #364 from tendermint/collapse_info
tmsp: ResponseInfo and ResponseEndBlock
2017-01-12 15:43:59 -05:00
80f377135b AppendTx -> DeliverTx 2017-01-12 15:27:08 -05:00
2dd7030579 tmsp: ResponseInfo and ResponseEndBlock 2017-01-12 15:21:20 -05:00
2e414ebe6b Merge pull request #42 from tendermint/collapse_info
Flatten ResponseInfo
2017-01-12 15:20:59 -05:00
490a96ef66 drop unneeded variable copy 2017-01-12 15:18:38 -05:00
f8167872d8 EndBlock also returns ResponseEndBlock 2017-01-12 14:50:41 -05:00
8b76f3dd00 Make fields in ResponseInfo be flat 2017-01-12 14:50:41 -05:00
0d82d26408 Frist commit on types.proto 2017-01-12 14:50:08 -05:00
e7a12f8e38 cs.Wait() 2017-01-12 14:44:42 -05:00
2337086736 use mtx in OnStop 2017-01-12 14:32:48 -05:00
0525e8ed5c rearrange common_test.go; EnsureDir for privVal 2017-01-12 12:38:09 -05:00