| 
							
							
								 Tomasz Drwięga | d0f7555348 | Merge branch 'master' into updating_clippy Conflicts:
	util/src/journaldb/archivedb.rs | 2016-03-12 10:40:22 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 4b6e1dd4d2 | Fixing warnings | 2016-03-12 10:25:51 +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 | 08b4488ef3 | Merge branch 'master' into personal-rpc-cli Conflicts:
	parity/main.rs | 2016-03-11 20:54:18 +04: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 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 22d1def894 | Merge pull request #666 from ethcore/moregethcli More geth compatibility. | 2016-03-11 16:05:27 +03: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 |  | 
			
				
					| 
							
							
								 Nikolay Volf | d3f83ad7be | Merge branch 'master' into personal-rpc-cli | 2016-03-11 16:05:22 +04:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | ed0047725c | adding cli extension | 2016-03-11 15:49:49 +04:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | d84e008e00 | Removing superflous check for nightly | 2016-03-11 11:16:49 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | d9c462a3d3 | Use proper listen address. Tidyups. | 2016-03-11 10:05:27 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 4c757997f6 | Merge remote-tracking branch 'origin/master' into moregethcli | 2016-03-10 21:41:29 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 29916edb91 | More geth compatibility. | 2016-03-10 21:36:45 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | a2dea3885b | refactoring to AccountService | 2016-03-10 23:09:45 +04:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 84a48142de | Add more geth options. | 2016-03-10 19:50:04 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | a207b6a17e | Merge pull request #664 from ethcore/sync-provider extend sync status interface to sync provider | 2016-03-10 21:18:41 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 47aacbb819 | work is in progress | 2016-03-10 21:56:02 +04:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 2a24bb7cc6 | Merge pull request #663 from ethcore/archive_default --archive is default. --pruning is option. | 2016-03-10 20:48:04 +03:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 25a63611f8 | extend sync status interface to sync provider | 2016-03-10 20:32:17 +04:00 |  | 
			
				
					| 
							
							
								 Gav Wood | c951dee766 | --archive is default. --pruning is option. | 2016-03-10 17:09:34 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 8dd41bfe0c | Merge pull request #641 from ethcore/jsonrpc_interfaces jsonrpc uses client and sync interfaces | 2016-03-10 15:44:05 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 0f056f3abb | Merge branch 'master' into clippy-dev Conflicts:
	Cargo.toml | 2016-03-10 02:45:53 +04:00 |  | 
			
				
					| 
							
							
								 Gav Wood | ac42045155 | Merge pull request #639 from ethcore/keys-cli Keys cli | 2016-03-10 00:25:01 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | accc1db43f | chaning docopt config a bit | 2016-03-09 23:39:36 +04:00 |  | 
			
				
					| 
							
							
								 debris | 423dd7e0a9 | updated jsonrpc-core and http-server libs | 2016-03-09 18:04:13 +01:00 |  | 
			
				
					| 
							
							
								 debris | 082a4d9078 | jsonrpc uses client and sync interfaces as a preparetion for jsonrpc tests | 2016-03-09 17:31:43 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 7ff4d14544 | adding return to if branch | 2016-03-09 19:27:44 +04:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | f49e32cc79 | Merge branch 'master' into keys-cli | 2016-03-09 19:20:17 +04:00 |  | 
			
				
					| 
							
							
								 debris | bcb9b0e457 | wait_for_exit takes only one input param, which is PanicHandler | 2016-03-09 15:32:27 +01:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 6ad0ba8fe2 | basic commands | 2016-03-09 17:11:15 +04:00 |  | 
			
				
					| 
							
							
								 debris | 3655354980 | Merge branch 'master' into jsonrpc_panic_handle | 2016-03-09 13:46:08 +01:00 |  | 
			
				
					| 
							
							
								 debris | a1640dcf72 | jsonrpc panic handle | 2016-03-09 11:38:53 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | b2fc077f8c | Fixing CLI parameters | 2016-03-08 16:42:33 +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 | ec3698066b | Normal CLI options with geth. Support node identity.
Support fine-grained JSONRPC API enabling. | 2016-03-07 12:21:11 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | bc2fb14b5d | Add memory usage reports. Update to be similar to master. | 2016-03-06 22:39:04 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 559e01ea84 | Review remarks resolved. | 2016-03-04 22:54:59 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | bbbaffbc53 | "--archive" option for disabling the journal DB Fixes #579 | 2016-03-04 21:06:28 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 48df869202 | --author and --extra-data options. Fixed null parent-hash. | 2016-03-01 16:58:14 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 2c32b0fc1c | Merge branch 'master' into mining | 2016-02-29 16:40:57 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 83b8e7df5a | Initial refactor and block closing. | 2016-02-29 14:57:41 +01:00 |  | 
			
				
					| 
							
							
								 debris | 77bfe5ae00 | jsonrpc uses weak pointers to client | 2016-02-29 11:58:33 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | b3f09596b1 | Merge pull request #516 from ethcore/sync Better memory management | 2016-02-27 15:54:19 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 5d5471f981 | Fix minor typo. | 2016-02-26 22:40:32 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 92625a5095 | Merge branch 'master' of github.com:ethcore/parity | 2016-02-26 22:39:23 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 34bc02af1e | Merge branch 'master' of github.com:ethcore/parity into network | 2016-02-26 14:23:10 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 1b9f428183 | Merge branch 'master' of github.com:ethcore/parity into sync | 2016-02-25 14:20:28 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 781f763f1f | Memory management | 2016-02-25 14:09:39 +01:00 |  | 
			
				
					| 
							
							
								 Marek Kotewicz | ba464bbac4 | Merge pull request #493 from ethcore/jsonrpc_security jsonrpc security, cors headers, fixed #359 | 2016-02-25 14:08:18 +01:00 |  |