Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							42499addc8
							
						
					 | 
					
						
						
							
							Merge pull request #714 from ethcore/master-version
						
						
						
						
						
						
						
						Version 1.1 in master 
						
					 | 
					
						2016-03-14 13:40:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							5503cd4646
							
						
					 | 
					
						
						
							
							Lock reports to avoid out of order badness.
						
						
						
						
						
					 | 
					
						2016-03-14 12:41:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							44223f3658
							
						
					 | 
					
						
						
							
							Merge pull request #720 from ethcore/network
						
						
						
						
						
						
						
						Silence UDP warnings 
						
					 | 
					
						2016-03-14 11:10:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f4323f3bb
							
						
					 | 
					
						
						
							
							Merge branch 'master' into pv63-receipts
						
						
						
						
						
						
						
						Conflicts:
	ethcore/src/client/test_client.rs 
						
					 | 
					
						2016-03-14 11:06:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							7320ad077f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into targetgaslimit
						
						
						
						
						
					 | 
					
						2016-03-14 10:54:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							3eb08b0d61
							
						
					 | 
					
						
						
							
							fix tests and deuncommented
						
						
						
						
						
					 | 
					
						2016-03-14 10:53:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc8b9c3205
							
						
					 | 
					
						
						
							
							Fix build.
						
						
						
						
						
					 | 
					
						2016-03-14 10:48:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							829ed4d0a6
							
						
					 | 
					
						
						
							
							commented empty slice/vec comparison
						
						
						
						
						
					 | 
					
						2016-03-14 10:47:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							acd39843d4
							
						
					 | 
					
						
						
							
							Merge pull request #715 from ethcore/rpc-personal-tests
						
						
						
						
						
						
						
						Rpc personal tests 
						
					 | 
					
						2016-03-14 10:31:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1fe1a6136
							
						
					 | 
					
						
						
							
							Merge pull request #704 from ethcore/fixing_warnings
						
						
						
						
						
						
						
						Fixing warnings 
						
					 | 
					
						2016-03-14 10:28:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5fa49376e
							
						
					 | 
					
						
						
							
							Merge pull request #713 from ethcore/docoptclean
						
						
						
						
						
						
						
						docopts cleanups 
						
					 | 
					
						2016-03-14 10:26:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3c1b5455b
							
						
					 | 
					
						
						
							
							Silenced UDP warnings
						
						
						
						
						
					 | 
					
						2016-03-14 10:25:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							8532f2dc2e
							
						
					 | 
					
						
						
							
							removed tests that used fixedhash
						
						
						
						
						
					 | 
					
						2016-03-14 09:44:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4ba070619
							
						
					 | 
					
						
						
							
							Merge branch 'master' into master-version
						
						
						
						
						
					 | 
					
						2016-03-14 09:40:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							6827ff9319
							
						
					 | 
					
						
						
							
							[ci skip] fix tesh.sh
						
						
						
						
						
					 | 
					
						2016-03-14 09:38:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							7af0a1dc2c
							
						
					 | 
					
						
						
							
							Missing comma.
						
						
						
						
						
					 | 
					
						2016-03-14 02:02:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6b7884a1d
							
						
					 | 
					
						
						
							
							Allow configuration of target gas limit.
						
						
						
						
						
					 | 
					
						2016-03-14 02:00:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							c53974f125
							
						
					 | 
					
						
						
							
							Merge pull request #717 from ethcore/build
						
						
						
						
						
						
						
						Removed rocksdb build dependency 
						
					 | 
					
						2016-03-14 01:58:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ad66875e5
							
						
					 | 
					
						
						
							
							Merge pull request #710 from ethcore/fix-discovery
						
						
						
						
						
						
						
						Fixed splitting Neighbours packet 
						
					 | 
					
						2016-03-14 01:32:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bc3c0b026
							
						
					 | 
					
						
						
							
							Removed rocksdb build dependency
						
						
						
						
						
					 | 
					
						2016-03-14 01:27:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							2117d363e2
							
						
					 | 
					
						
						
							
							new account test & fix
						
						
						
						
						
					 | 
					
						2016-03-14 01:06:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e7ff2c00e
							
						
					 | 
					
						
						
							
							Version 1.1
						
						
						
						
						
					 | 
					
						2016-03-14 01:00:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							e792998d0a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into fixing_warnings
						
						
						
						
						
					 | 
					
						2016-03-14 01:00:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe722419e7
							
						
					 | 
					
						
						
							
							Merge branch 'master' into fixing_warnings
						
						
						
						
						
					 | 
					
						2016-03-14 00:57:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d1a837a8b
							
						
					 | 
					
						
						
							
							docopts cleanups.
						
						
						
						
						
						
						
						one for @LefterisJP: 80-character line for docopts. 
						
					 | 
					
						2016-03-14 00:52:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							1957a14961
							
						
					 | 
					
						
						
							
							personal tests setup
						
						
						
						
						
					 | 
					
						2016-03-14 00:48:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							615e03542e
							
						
					 | 
					
						
						
							
							Use slice.chunks
						
						
						
						
						
					 | 
					
						2016-03-14 00:41:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							45c3600d5a
							
						
					 | 
					
						
						
							
							Fixed splitting Neighbours packet
						
						
						
						
						
					 | 
					
						2016-03-13 23:20:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							97fe4fcab4
							
						
					 | 
					
						
						
							
							Merge pull request #701 from ethcore/sstore-key-exp
						
						
						
						
						
						
						
						management of account expiration & memory 
						
					 | 
					
						2016-03-13 23:19:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a019801d2
							
						
					 | 
					
						
						
							
							Merge pull request #708 from ethcore/docsfix
						
						
						
						
						
						
						
						Remove EarlyMerge from user docs. 
						
					 | 
					
						2016-03-13 23:15:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							8fd8f687ee
							
						
					 | 
					
						
						
							
							Remove EarlyMerge from user docs.
						
						
						
						
						
					 | 
					
						2016-03-13 23:12:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb651b6462
							
						
					 | 
					
						
						
							
							Merge pull request #705 from ethcore/refcounteddb
						
						
						
						
						
						
						
						Fixes and traces for refcountdb. 
						
					 | 
					
						2016-03-13 23:07:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c964694b4
							
						
					 | 
					
						
						
							
							Merge pull request #706 from ethcore/fix-accountdb
						
						
						
						
						
						
						
						Check for NULL_RLP in AccountDB 
						
					 | 
					
						2016-03-13 22:29:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							26f41b711c
							
						
					 | 
					
						
						
							
							Bring back batching.
						
						
						
						
						
					 | 
					
						2016-03-13 21:54:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ccb9df4f1
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into rcdb
						
						
						
						
						
					 | 
					
						2016-03-13 21:43:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd834084f9
							
						
					 | 
					
						
						
							
							unknonw lint
						
						
						
						
						
					 | 
					
						2016-03-13 21:39:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							90d135e018
							
						
					 | 
					
						
						
							
							Merge pull request #700 from ethcore/merge_ethminer
						
						
						
						
						
						
						
						ethminer as crate 
						
					 | 
					
						2016-03-13 21:35:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							420f473f90
							
						
					 | 
					
						
						
							
							Check for NULL_RLP in AccountDB
						
						
						
						
						
					 | 
					
						2016-03-13 21:28:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							1be92ea8ef
							
						
					 | 
					
						
						
							
							Fixes and traces for refcountdb.
						
						
						
						
						
					 | 
					
						2016-03-13 21:21:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							13df958f4a
							
						
					 | 
					
						
						
							
							Fixing warnings
						
						
						
						
						
					 | 
					
						2016-03-13 21:14:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cf18c728d
							
						
					 | 
					
						
						
							
							Fixing sync invalid sync test
						
						
						
						
						
					 | 
					
						2016-03-13 20:53:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2e067cdd0
							
						
					 | 
					
						
						
							
							Bumping clippy
						
						
						
						
						
					 | 
					
						2016-03-13 20:44:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							54ff64c0e0
							
						
					 | 
					
						
						
							
							Merge branch 'master' into merge_ethminer
						
						
						
						
						
						
						
						Conflicts:
	parity/main.rs 
						
					 | 
					
						2016-03-13 20:42:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5edf237b2
							
						
					 | 
					
						
						
							
							adding shrink-to-fit
						
						
						
						
						
					 | 
					
						2016-03-13 19:52:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							81291622eb
							
						
					 | 
					
						
						
							
							Avoid batches for now.
						
						
						
						
						
					 | 
					
						2016-03-13 19:22:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							48df41a30a
							
						
					 | 
					
						
						
							
							Merge pull request #692 from ethcore/refcounteddb
						
						
						
						
						
						
						
						Old ref-counted DB code 
						
					 | 
					
						2016-03-13 19:02:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							706c56f56a
							
						
					 | 
					
						
						
							
							Usage of LATEST_ERA fixes for archive and ref-counted DBs.
						
						
						
						
						
					 | 
					
						2016-03-13 18:19:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							5107fc5897
							
						
					 | 
					
						
						
							
							Update options.
						
						
						
						
						
					 | 
					
						2016-03-13 18:09:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac655af091
							
						
					 | 
					
						
						
							
							Update overlaydb
						
						
						
						
						
					 | 
					
						2016-03-13 18:07:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e912c7c0d
							
						
					 | 
					
						
						
							
							Add new file.
						
						
						
						
						
					 | 
					
						2016-03-13 18:07:10 +01:00 | 
					
					
						
						
							
							
							
						
					 |