| 
							
							
								 Nikolay Volf | b6f74bd143 | Merge branch 'master' into nvolf Conflicts:
	util/src/journaldb.rs | 2016-02-08 00:58:59 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 69a4349ee2 | documentation | 2016-02-08 00:52:56 +03:00 |  | 
			
				
					| 
							
							
								 Gav Wood | d38431beff | Merge pull request #365 from ethcore/ark block_queue::clear should be more thorough | 2016-02-07 22:47:04 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | c55ff797a7 | Merge pull request #363 from ethcore/state Fixed an issue with forked counters | 2016-02-07 22:46:57 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | e9af2dfd96 | new hashes tests | 2016-02-08 00:20:59 +03:00 |  | 
			
				
					| 
							
							
								 arkpar | 63f2f42035 | Restored trace | 2016-02-07 22:16:58 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 4b1d67ef49 | bunch of tests for new block packet | 2016-02-08 00:08:15 +03:00 |  | 
			
				
					| 
							
							
								 arkpar | 6c36a7e1a6 | Apply all removes after updating all counters | 2016-02-07 21:33:24 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 3f17acca1d | empty new block test | 2016-02-07 23:01:09 +03:00 |  | 
			
				
					| 
							
							
								 arkpar | 28dd73e340 | Updated counter comment | 2016-02-07 18:28:47 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 976b10a4ef | Removed warning supression | 2016-02-07 18:28:47 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | b2f69a08ca | Clarified counters | 2016-02-07 18:28:47 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | f2ed89be46 | Fixed an issue with forked counters | 2016-02-07 18:28:47 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | c3f23839e8 | Merge branch 'ark' into nvolf | 2016-02-07 13:40:00 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 37cc69542c | Merge branch 'state' into nvolf | 2016-02-07 13:39:06 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | efef36b5e8 | handling sync message | 2016-02-07 03:00:43 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | d40d4ef87c | fix  tests | 2016-02-07 01:43:44 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 0e0f1fea69 | tests | 2016-02-07 01:15:53 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 67c5e376b8 | review fixes | 2016-02-06 23:40:41 +03:00 |  | 
			
				
					| 
							
							
								 debris | 4116bdd8fd | Merge branch 'master' into jsonrpc | 2016-02-06 21:31:46 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 3e84691cec | adding expect | 2016-02-06 23:31:37 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 74c97ea36d | removed unused latest_number | 2016-02-06 23:08:20 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 8cd55276c3 | ... and test as well | 2016-02-06 23:04:58 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 391ef7e664 | actually should be this way | 2016-02-06 23:03:26 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 9727f27854 | blocks + hashes | 2016-02-06 23:00:52 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 62f3b8cae5 | Merge branch 'master' into block-propagation | 2016-02-06 22:34:13 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 6b02b6eddb | using rlp::encode | 2016-02-06 22:25:20 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 0905372f70 | updating peer best hash when sync | 2016-02-06 22:23:25 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 49e61b87a0 | calculating peer highest number on fly | 2016-02-06 22:16:59 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | b606df451e | many fixes | 2016-02-06 20:56:21 +03:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 564a191e36 | Better install text. | 2016-02-06 15:07:26 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 87f7406548 | Fix newline characters. | 2016-02-06 15:03:44 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | e03ba708db | Better promting. | 2016-02-06 14:59:37 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 123b001312 | More tweaks to the deps script to manage edge-cases. | 2016-02-06 14:28:06 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 7f75db688d | Merge branch 'master' of github.com:ethcore/parity | 2016-02-06 14:10:38 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | d2656c6991 | install-deps uses the new repo for rocksdb. | 2016-02-06 14:10:20 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | a6059a0c7d | Merge pull request #362 from ethcore/install-parity Install parity | 2016-02-06 00:05:28 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 2163d8d597 | Block queue clear now clears everything | 2016-02-06 00:03:16 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | b01f954b05 | final tests | 2016-02-06 01:45:25 +03:00 |  | 
			
				
					| 
							
							
								 arkpar | 4af85b488b | Fixed an issue with forked counters | 2016-02-05 22:54:33 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 90e4722284 | Merge branch 'master' into block-propagation | 2016-02-05 21:47:27 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | cc3f712fec | propagade initial | 2016-02-05 09:34:08 -08:00 |  | 
			
				
					| 
							
							
								 KKudryavtsev | 13c20ead1d | tabified | 2016-02-05 17:26:09 +00:00 |  | 
			
				
					| 
							
							
								 KKudryavtsev | a2ad323ed0 | Merge branch 'master' into install-parity | 2016-02-05 17:24:14 +00:00 |  | 
			
				
					| 
							
							
								 KKudryavtsev | 183ddbc4da | revert parity deb url back to release value | 2016-02-05 17:23:12 +00:00 |  | 
			
				
					| 
							
							
								 KKudryavtsev | 39500cf59c | fixed prompt to install | 2016-02-05 17:05:50 +00:00 |  | 
			
				
					| 
							
							
								 KKudryavtsev | dc3d1c5098 | bump rocksdb to 4.2 | 2016-02-05 17:01:35 +00:00 |  | 
			
				
					| 
							
							
								 KKudryavtsev | cc898a4b3b | debugging npm | 2016-02-05 16:07:43 +00:00 |  | 
			
				
					| 
							
							
								 KKudryavtsev | 24c85d928b | debugging npm install | 2016-02-05 16:04:40 +00:00 |  | 
			
				
					| 
							
							
								 KKudryavtsev | 472019471e | debug deb | 2016-02-05 15:59:07 +00:00 |  |