| 
							
							
								 Gav Wood | b03679e1a6 | Fix typos. | 2016-03-12 11:22:02 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 82a8810057 | Rename into something that is a little more descriptive. | 2016-03-12 11:19:42 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 88e23fcb9a | Merge pull request #634 from ethcore/jdb_option2 JournalDB with in-memory overlay (option2) | 2016-03-12 10:01:17 +01:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 1031ce641d | Merge pull request #682 from ethcore/additional_sstore_test additional (failing) SecretStore test | 2016-03-11 22:45:43 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 896ba57555 | Merge branch 'master' of github.com:ethcore/parity into jdb_option2 | 2016-03-11 22:43:59 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | b1327a045f | fixed new account generation | 2016-03-11 22:47:12 +04:00 |  | 
			
				
					| 
							
							
								 debris | 90e20cbcad | additional (failing) sstore test | 2016-03-11 20:08:01 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | f724cab92d | Merge branch 'master' into updating_clippy Conflicts:
	ethcore/src/lib.rs
	sync/src/chain.rs
	sync/src/lib.rs
	util/src/keys/store.rs
	util/src/lib.rs | 2016-03-11 19:17:09 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 87fb0b31eb | Merge branch 'master' into reorgjdb | 2016-03-11 20:05:41 +04:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 03a4f9e268 | Merge pull request #673 from ethcore/boxjdb JournalDB -> Box<JournalDB>, and it's a trait. | 2016-03-11 20:03:39 +03:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 179569f9f8 | Adding std::mem back | 2016-03-11 16:01:18 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 04af38bb0d | fix test compilation | 2016-03-11 18:54:28 +04:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | fcc0432856 | Merge pull request #675 from ethcore/rpc_unit_tests fixed U256 and transaction request deserialization | 2016-03-11 17:25:13 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 8d67316ece | Merge branch 'master' into reorgjdb Conflicts:
	parity/main.rs | 2016-03-11 17:41:04 +04:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 38d470f3bc | Reorganise command line options into more general engine. | 2016-03-11 14:45:19 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 7e8b6c3660 | Merge branch 'boxjdb' into reorgjdb | 2016-03-11 14:06:32 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | b25551be7b | Merge pull request #671 from ethcore/clippy_hook Removing running clippy by default on nightly. | 2016-03-11 14:03:16 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 51cfd4b0ea | Remove unneeded clone. | 2016-03-11 13:58:11 +01:00 |  | 
			
				
					| 
							
							
								 debris | ecd33a6093 | fixed U256 and transaction request deserialization, added tests for transaction request | 2016-03-11 13:54:52 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 4771fdf0fb | Rearrange journaldb infrastructure. | 2016-03-11 13:50:39 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 2a856a13f0 | Obvious typo fix. | 2016-03-11 13:21:53 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | d71c5d4c17 | Place Sync/Send in trait. | 2016-03-11 13:19:10 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | e461916f5a | Merge remote-tracking branch 'origin/master' into boxjdb | 2016-03-11 12:56:33 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 756f964130 | JournalDB -> Box<JournalDB>, and it's a trait. | 2016-03-11 12:54:48 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 8f54c24e47 | Merged changes from jdb_option1, keep LATEST_ERA from decreasing | 2016-03-11 11:52:11 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | d84e008e00 | Removing superflous check for nightly | 2016-03-11 11:16:49 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 8709dd28f8 | Fixing clippy warnings | 2016-03-11 10:58:51 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 3a4a7ac822 | Bumping clippy version | 2016-03-11 10:35:26 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 06a3abd01e | Removed unused return type | 2016-03-10 21:15:43 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 8785bd37e8 | Merge branch 'master' of github.com:ethcore/parity into jdb_option2 | 2016-03-10 21:06:21 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | a2dea3885b | refactoring to AccountService | 2016-03-10 23:09:45 +04:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 5571503c22 | traitified secret store | 2016-03-10 20:18:01 +04:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 1a28e9297c | Merge pull request #655 from ethcore/io Stop workers before stopping event loop | 2016-03-10 12:53:00 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | ff12b53ba6 | Stop workers before stopping event loop | 2016-03-10 10:40:16 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 0f056f3abb | Merge branch 'master' into clippy-dev Conflicts:
	Cargo.toml | 2016-03-10 02:45:53 +04:00 |  | 
			
				
					| 
							
							
								 arkpar | c302fa9a4e | Style | 2016-03-09 18:37:44 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 6ad0ba8fe2 | basic commands | 2016-03-09 17:11:15 +04:00 |  | 
			
				
					| 
							
							
								 arkpar | ca7d3b91d0 | Merge branch 'master' of github.com:ethcore/parity into jdb_option2 | 2016-03-08 18:35:25 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | b61c0397bc | removing unused variable | 2016-03-07 14:36:38 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 69db469d39 | Merge branch 'master' into clippy-dev Conflicts:
	util/src/journaldb.rs | 2016-03-07 14:35:42 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | cbc2c0cf0c | Fixing clippy warnings. When building on nightly it is required to enable clippy | 2016-03-07 14:34:17 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 72016196cd | Remove println!s. | 2016-03-07 10:56:39 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 318e7e9e04 | Merge pull request #613 from ethcore/jdb_option1 JournalDB option 1 fix | 2016-03-07 09:38:50 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 4d1effb008 | Fix tests. | 2016-03-07 09:10:02 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 73207c2355 | Revert accidental beta regressions. | 2016-03-07 08:01:14 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | fd87633db6 | Remove superfluous LATEST_KEY write. | 2016-03-07 07:57:50 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 744c4c7d8b | JournalDB documentation | 2016-03-07 07:06:55 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 0980c7130a | Fix replay_keys Counters should never have an entry with zero value. | 2016-03-07 06:58:43 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 4230fdfffe | More veriosning fixups. | 2016-03-06 22:43:21 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | bc2fb14b5d | Add memory usage reports. Update to be similar to master. | 2016-03-06 22:39:04 +01:00 |  |