Commit Graph

3608 Commits

Author SHA1 Message Date
arkpar
d9fec87143 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:39:43 +01:00
Gav Wood
1866174327 Merge pull request #475 from ethcore/multirust-override
update readme with rust override
2016-02-19 13:31:28 +01:00
Gav Wood
8747fe2dc9 Merge pull request #449 from ethcore/secret-store-enc
Secret store (part2 - encrypted key/value svc)
2016-02-19 13:30:45 +01:00
Gav Wood
d43b23d663 Update directory.rs 2016-02-19 13:30:36 +01:00
Gav Wood
9dfa54a6b7 Merge pull request #474 from ethcore/rustbeta
fixed warnings on rust beta
2016-02-19 13:28:49 +01:00
Nikolay Volf
fe979f0d46 [ci skip] update readme with rust override 2016-02-19 15:21:52 +03:00
Gav Wood
2cc690f31f Better user errors.
Fixed up README.
2016-02-19 12:54:51 +01:00
Nikolay Volf
63c5a2e58f copy instead of ref-map 2016-02-19 14:52:29 +03:00
debris
ef8055f900 Merge branch 'master' into jsonrpc2 2016-02-19 12:52:16 +01:00
debris
ecde760b42 Merge branch 'master' of github.com:ethcore/parity into rustbeta 2016-02-19 12:40:30 +01:00
debris
b5d6359030 fixed allow warnings in ethcore 2016-02-19 12:40:23 +01:00
Arkadiy Paronyan
57ef5e2691 Merge pull request #473 from ethcore/killtest
Kill bad test.
2016-02-19 12:36:36 +01:00
Nikolay Volf
25bae2897b [ci skip] merging master 2016-02-19 14:25:51 +03:00
Gav Wood
1cd76de8ba Update readme for betaUpdate readme for beta 2016-02-19 11:57:59 +01:00
debris
f50bf528e6 fixed allow warnings in util 2016-02-19 11:57:52 +01:00
Gav Wood
33b649bb01 Update script. 2016-02-19 11:57:04 +01:00
Gav Wood
4f6bff1c47 Kill bad test. 2016-02-19 11:39:36 +01:00
Gav Wood
0e10efc727 Update blockchain.rs 2016-02-19 11:33:46 +01:00
Gav Wood
a4846e4aad Update bytes.rs 2016-02-19 11:31:40 +01:00
Marek Kotewicz
f307a0c705 Merge pull request #470 from ethcore/rustbeta
Rustbeta
2016-02-19 11:28:32 +01:00
Gav Wood
ba4c2c94ec Update Cargo.toml 2016-02-19 11:26:24 +01:00
debris
8831e73d98 ignore panic forwarding tests 2016-02-19 11:05:39 +01:00
debris
2ad8f6bd74 do not run benches on travis 2016-02-19 11:03:02 +01:00
debris
bef6d5f2a1 fixed insecure rlp uint conversion, and failing json tests 2016-02-19 10:51:35 +01:00
debris
e3e84020f4 travis-beta and travis-nightly feaetures 2016-02-19 01:25:06 +01:00
debris
f45b2f9a24 .travis matrix fixes for rust beta 2016-02-19 01:13:00 +01:00
debris
1486b7e6a0 add beta to build matrix 2016-02-19 00:55:57 +01:00
Arkadiy Paronyan
89b84d4551 Merge pull request #469 from ethcore/ethcore_compiling
parity compiling fine
2016-02-19 00:53:50 +01:00
debris
c0aca706d2 removed commented out line 2016-02-19 00:51:17 +01:00
debris
19a3daf533 parity compiling fine 2016-02-19 00:50:23 +01:00
arkpar
8fa62130e3 Added TODOs 2016-02-19 00:23:05 +01:00
Nikolay Volf
d2349cdd8e Merge pull request #468 from ethcore/ethcore_compiling
compiling ethcore on beta
2016-02-19 02:12:23 +03:00
debris
df3d17789a compiling ethcore on beta 2016-02-19 00:06:06 +01:00
Marek Kotewicz
3c599838dc Merge pull request #467 from ethcore/ark_beta
Utils compiling in beta
2016-02-18 23:33:39 +01:00
arkpar
af8ba06795 utils compilable in beta 2016-02-18 23:29:41 +01:00
Nikolay Volf
704d6bd069 Merge pull request #466 from ethcore/ethash
Get rid of lru_cache dependency
2016-02-19 00:38:21 +03:00
arkpar
cc5384fff5 Get rid of lru_cache dependency 2016-02-18 22:35:14 +01:00
arkpar
e0623f57f9 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-18 21:49:11 +01:00
arkpar
68795ea031 Fixed typos 2016-02-18 21:40:17 +01:00
arkpar
99600ba370 DB Test 2016-02-18 21:15:56 +01:00
Gav Wood
8e93989eec Merge branch 'rustup' into rustbeta 2016-02-18 21:09:36 +01:00
Gav Wood
ae2ef83f16 Merge branch 'clippy_optional' of https://github.com/Manishearth/parity into Manishearth-clippy_optional 2016-02-18 20:59:28 +01:00
Nikolay Volf
beb0da4ff4 and adding actual dependency 2016-02-18 22:56:21 +03:00
Gav Wood
f84ffdbfef Merge pull request #459 from ethcore/daemonize
Add daemonization.
2016-02-18 20:50:10 +01:00
Nikolay Volf
031b15daab update cargo.lock 2016-02-18 22:12:25 +03:00
Nikolay Volf
8b4278aeaa feature dep for heapsize 2016-02-18 22:06:59 +03:00
Nikolay Volf
198119466b forking heapsize 2016-02-18 19:21:24 +03:00
debris
80f4f422fc updated heapsizeof 2016-02-18 15:17:26 +01:00
debris
ebe8e19cc0 fixed compiling with rustc 1.8.0-nightly (57c357d89 2016-02-16) 2016-02-18 14:36:59 +01:00
Gav Wood
7d75626e75 Fix options. 2016-02-18 14:28:24 +01:00