Commit Graph

151 Commits

Author SHA1 Message Date
petevine
763d78af87 Update dependencies 2016-04-17 01:50:04 +02:00
NikVolf
dc7e105ef8 Merge branch 'master' into ipc-hypervisor 2016-04-14 21:57:24 +03:00
NikVolf
405e3e2e7d initial setup 2016-04-13 19:03:57 +03:00
Tomasz Drwięga
6b03a3218c Bumping clippy version 2016-04-12 13:51:39 +02:00
NikVolf
69add61174 basic upgrade scenario 2016-04-10 16:12:20 +03:00
Tomasz Drwięga
508daad011 Enabling webapps by default 2016-04-08 11:18:46 +02:00
Tomasz Drwięga
1e9e0c32fa Disabling webapp server by default 2016-04-07 12:15:39 +02:00
Tomasz Drwięga
e3ce5d94e1 Adding webapps crate 2016-04-07 10:49:00 +02:00
Tomasz Drwięga
e8fa429438 Bumping clippy 2016-04-06 09:53:56 +02:00
Gav Wood
63a9fa172c Avoid openssl dep. 2016-03-28 10:25:19 +02:00
Gav Wood
b606fb68cf USD-based pricing of gas. 2016-03-28 00:49:35 +02:00
NikVolf
c014d5d12e debug symbols for master/beta 2016-03-25 16:55:48 +03:00
Gav Wood
0e026ed11f Fix author reporting. num_cpus for JSONRPC threads. 2016-03-22 19:12:17 +01:00
debris
b9623e6c5b improvements to build, updated dependencies, moved rpctest to its own submodule 2016-03-19 23:27:50 +01:00
debris
757f0c9bc4 Merge branch 'master' of github.com:ethcore/parity into ethrpc_test 2016-03-18 18:05:29 +01:00
Tomasz Drwięga
338e5fadb9 Bumping clippy 2016-03-18 10:08:47 +01:00
debris
f92a0c8df2 rpctest executable 2016-03-17 11:50:31 +01:00
debris
d96858d38c proper blockchain json parsing 2016-03-15 18:17:48 +01:00
arkpar
9e7ff2c00e Version 1.1 2016-03-14 01:00:17 +01:00
Gav Wood
4a58e142bd Remove duplicate ciippys. 2016-03-13 15:02:08 +01:00
Gav Wood
02f43f2e8c Merge branch 'ethminer_crate' 2016-03-13 15:00:47 +01:00
Tomasz Drwięga
e10457d235 Bumping clippy 2016-03-12 10:06:50 +01:00
Tomasz Drwięga
aebc91d96f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml
2016-03-12 09:50:18 +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
Tomasz Drwięga
03da6c991f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.lock
	Cargo.toml
	ethcore/src/client/client.rs
	hook.sh
	parity/main.rs
	rpc/Cargo.toml
	rpc/src/v1/impls/eth.rs
	sync/Cargo.toml
	sync/src/tests/helpers.rs
2016-03-11 14:37:07 +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
Tomasz Drwięga
d84e008e00 Removing superflous check for nightly 2016-03-11 11:16:49 +01:00
Tomasz Drwięga
a8a21da9ba Updating hook and removing running clippy from dev-dependencies 2016-03-11 11:05:20 +01:00
Tomasz Drwięga
3a4a7ac822 Bumping clippy version 2016-03-11 10:35:26 +01:00
arkpar
a6b5aad8c9 Merge branch 'master' of github.com:ethcore/parity into thread 2016-03-10 18:40:17 +01:00
Tomasz Drwięga
2e72173620 Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs
2016-03-10 12:25:36 +01:00
Tomasz Drwięga
2f9b955210 Merge branch 'master' into ethminer_crate
Conflicts:
	parity/main.rs
2016-03-10 09:39:26 +01:00
Tomasz Drwięga
9f77a85491 Fixing compilation on nightly 2016-03-10 09:35:46 +01:00
Tomasz Drwięga
878e38c0cf Fixing deps again 2016-03-10 09:33:25 +01:00
Tomasz Drwięga
3c1888c26a Fixing deps 2016-03-10 09:26:04 +01:00
Nikolay Volf
0f056f3abb Merge branch 'master' into clippy-dev
Conflicts:
	Cargo.toml
2016-03-10 02:45:53 +04:00
Nikolay Volf
6ad0ba8fe2 basic commands 2016-03-09 17:11:15 +04:00
Tomasz Drwięga
84444c697c Adding ethminer to dev/ci files 2016-03-08 15:53:12 +01:00
Tomasz Drwięga
99a6802b61 Moving block sealing and transaction_queue to separate create 2016-03-08 15:46:44 +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
Tomasz Drwięga
3153d12bd9 feature enabled when compiling without --release 2016-03-07 11:40:44 +01:00
arkpar
cb4d17825b Fixed lock order 2016-02-29 19:49:29 +01:00
arkpar
0ccbba9073 Merge branch 'master' of github.com:ethcore/parity into thread 2016-02-29 18:11:59 +01:00
arkpar
08d54f9b49 Merge branch 'master' of github.com:ethcore/parity into thread 2016-02-26 13:38:06 +01:00
arkpar
781f763f1f Memory management 2016-02-25 14:09:39 +01:00
arkpar
40f908a499 Log formatting 2016-02-23 20:14:37 +01:00
Tomusdrw
c2952b49b4 Bumping clippy version Fixes #496 2016-02-23 10:47:57 +01:00
arkpar
778fa92ebe Remove locks from the block chain 2016-02-22 23:52:39 +01:00
arkpar
c8076b2f9d Threading performance optimizations 2016-02-22 23:41:59 +01:00
Gav Wood
6fa2284c68 Remove unneeded deps. 2016-02-21 20:03:01 +01:00