Commit Graph
9140 Commits
Author SHA1 Message Date
Ethan Buchman de56442660 Merge branch 'master' into develop 2017-01-12 21:40:43 -05:00
Ethan BuchmanandGitHub 3d98f675f3 Merge pull request #11 from tendermint/develop
Develop
2017-01-12 21:39:57 -05:00
Ethan BuchmanandGitHub b27edfd189 Merge pull request #1 from tendermint/develop
Include pwd dir to StartProcess
2017-01-12 21:39:27 -05:00
Ethan BuchmanandGitHub fddee66d90 Merge pull request #8 from tendermint/develop
use mtx in OnStop
2017-01-12 21:38:04 -05:00
Ethan BuchmanandGitHub 996c483f23 Merge pull request #4 from tendermint/develop
C LevelDB
2017-01-12 21:37:57 -05:00
Ethan BuchmanandGitHub e289af53b6 Merge pull request #6 from tendermint/develop
Develop
2017-01-12 21:37:18 -05:00
Ethan Buchman 42b7bfbf0c update version and glide 2017-01-12 21:20:09 -05:00
Ethan Buchman 67c9086b74 optional panic on AddPeer err 2017-01-12 21:09:24 -05:00
Ethan Buchman e47722ecb2 Connect2Switches: panic on err 2017-01-12 20:49:48 -05:00
Jae KwonandEthan Buchman 2b750ea49f Make Connect2Switches blocking 2017-01-12 20:49:48 -05:00
Ethan Buchman 58e42397f8 close conns on filter; fix order in MakeConnectedSwitch 2017-01-12 20:49:48 -05:00
Jae KwonandEthan Buchman bd353e004a QuitService->BaseService 2017-01-12 20:49:48 -05:00
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
Ethan Buchman c1952523cd update glide 2017-01-12 20:22:23 -05:00
Ethan Buchman 1afe0cb45f test: always rebuild grpc_client 2017-01-12 18:45:41 -05:00
Ethan BuchmanandGitHub 7075a8ed81 Merge pull request #365 from tendermint/rename
Rename
2017-01-12 16:41:52 -05:00
Ethan Buchman d83ca54b36 file name fixes 2017-01-12 16:17:43 -05:00
Ethan Buchman e0aead0be2 update glide 2017-01-12 16:12:41 -05:00
Ethan BuchmanandGitHub 624dca61b3 Merge pull request #47 from tendermint/rename
Rename
2017-01-12 16:06:40 -05:00
Ethan Buchman 5189a2248d TMSP -> ABCI 2017-01-12 16:04:32 -05:00
Ethan Buchman 94b6dd65ee AppendTx -> DeliverTx 2017-01-12 15:55:03 -05:00
Ethan Buchman c147b41013 TMSP -> ABCI 2017-01-12 15:53:32 -05:00
Ethan BuchmanandGitHub 3a55339114 Merge pull request #364 from tendermint/collapse_info
tmsp: ResponseInfo and ResponseEndBlock
2017-01-12 15:43:59 -05:00
Ethan Buchman 80f377135b AppendTx -> DeliverTx 2017-01-12 15:27:08 -05:00
Ethan Buchman 2dd7030579 tmsp: ResponseInfo and ResponseEndBlock 2017-01-12 15:21:20 -05:00
Ethan BuchmanandGitHub 2e414ebe6b Merge pull request #42 from tendermint/collapse_info
Flatten ResponseInfo
2017-01-12 15:20:59 -05:00
Ethan Buchman 490a96ef66 drop unneeded variable copy 2017-01-12 15:18:38 -05:00
Jae KwonandEthan Buchman f8167872d8 EndBlock also returns ResponseEndBlock 2017-01-12 14:50:41 -05:00
Jae KwonandEthan Buchman 8b76f3dd00 Make fields in ResponseInfo be flat 2017-01-12 14:50:41 -05:00
Jae KwonandEthan Buchman 0d82d26408 Frist commit on types.proto 2017-01-12 14:50:08 -05:00
Ethan Buchman e7a12f8e38 cs.Wait() 2017-01-12 14:44:42 -05:00
Ethan Buchman 2337086736 use mtx in OnStop 2017-01-12 14:32:48 -05:00
Ethan Buchman 0525e8ed5c rearrange common_test.go; EnsureDir for privVal 2017-01-12 12:38:09 -05:00
Ethan Buchman 1d091bafe9 update glide 2017-01-12 11:00:43 -05:00
Ethan Buchman 814ef37f75 fix tests 2017-01-12 10:58:44 -05:00
Ethan Buchman 94fed25975 fix test 2017-01-12 10:22:23 -05:00
Ethan Buchman 56341de5eb Merge remote-tracking branch 'mappum/rpc-tests' into unstable 2017-01-12 02:46:10 -05:00
Ethan Buchman 3c589dac19 startConsensusNet and stopConsensusNet 2017-01-12 02:29:53 -05:00
Ethan BuchmanandGitHub a7b7fe83d6 Merge pull request #46 from tendermint/updates
Updates
2017-01-12 01:11:11 -05:00
Ethan Buchman 831cb4adcd update glide 2017-01-12 01:08:31 -05:00
Ethan Buchman e6b9a2b6aa response struct and persistent args 2017-01-12 01:04:25 -05:00
rigelrozanskiandEthan Buchman 81b2697cce fix console exit, closes #35 2017-01-12 01:04:25 -05:00
rigelrozanskiandEthan Buchman c31df4081c added counter query support 2017-01-12 01:04:22 -05:00
Ethan BuchmanandGitHub 465c77e120 Merge pull request #43 from mappum/develop
tmsp-cli arg string handling + Make dummy query response values more clear
2017-01-12 00:23:33 -05:00
Ethan Buchman 0eb278ad3b version bump 0.6.0 2017-01-12 00:13:20 -05:00
Ethan BuchmanandGitHub b494cc5219 Merge pull request #5 from mappum/develop
Fix hex string handling
2017-01-12 00:12:11 -05:00
Ethan Buchman 618fce8d32 update glide 2017-01-11 23:47:28 -05:00
Ethan Buchman ce0c638005 little fix 2017-01-11 18:37:36 -05:00
Ethan BuchmanandGitHub 15d3d12098 Merge pull request #342 from akalyaev/feature/update-vagrant-setup
Feature: Update Vagrant setup
2017-01-11 18:03:20 -05:00
Ethan BuchmanandGitHub 76b4a45f98 Merge pull request #360 from tendermint/optional-skip-timeout-commit
Optional skip timeout commit
2017-01-11 18:02:46 -05:00