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 |
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 |
|
Gav Wood
|
1447fb9d30
|
Switch to using non-macro ready for beta.
|
2016-02-18 14:16:55 +01:00 |
|
Gav Wood
|
379876341e
|
Correct alignment.
|
2016-02-18 13:56:15 +01:00 |
|
Gav Wood
|
c6bcd464c2
|
Avoid changing user for daemonize. Just stick to the basics.
|
2016-02-18 13:54:18 +01:00 |
|
Gav Wood
|
7f2acedf9f
|
Reintroduce daemonize.
|
2016-02-18 13:10:04 +01:00 |
|
Gav Wood
|
870731cb9f
|
No need to bring in daemonize module.
|
2016-02-18 13:08:25 +01:00 |
|
Gav Wood
|
ca353dd18e
|
Remove daemonize feature.
|
2016-02-18 13:07:57 +01:00 |
|
Gav Wood
|
97f549cf5f
|
Add daemonization.
|
2016-02-18 12:42:01 +01:00 |
Manish Goregaokar
|
8802fb2fd8
|
Make clippy an optional dependency
|
2016-02-17 02:07:41 +05:30 |
|
Nikolay Volf
|
50b6c6d4ad
|
Merge pull request #448 from ethcore/master-upgrade
Master upgrade
|
2016-02-16 15:06:43 +03:00 |
|
Nikolay Volf
|
feb9b96ce7
|
version bump, test script for full suite
|
2016-02-16 13:40:58 +03:00 |
|
Nikolay Volf
|
6bafb34586
|
Merge pull request #447 from ethcore/rmcontrib
Remove contributing stuff now that we have CLA bot.
|
2016-02-16 13:20:18 +03:00 |
|
Nikolay Volf
|
b7c5b0a3c1
|
script for full test suite
|
2016-02-16 13:12:29 +03:00 |
|
Marek Kotewicz
|
cdce3697e0
|
Merge pull request #446 from ethcore/mordenboot
Add Morden bootnode.
|
2016-02-16 11:06:16 +01:00 |
|
Gav Wood
|
672518ba36
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-02-16 11:01:12 +01:00 |
|
Gav Wood
|
714f01fda7
|
Remove contributing stuff now that we have CLA bot.
|
2016-02-16 11:00:38 +01:00 |
|
Gav Wood
|
425350aa65
|
Add Morden bootnode.
|
2016-02-16 10:53:28 +01:00 |
|
Arkadiy Paronyan
|
dc6790915e
|
Merge pull request #441 from ethcore/beta-backmerge
beta fixes to master
|
2016-02-16 00:08:41 +01:00 |
|
Nikolay Volf
|
6bbe551ce8
|
returing beta dot-tags
|
2016-02-16 01:39:58 +03:00 |
|
Nikolay Volf
|
29980d3e96
|
travis fix
|
2016-02-16 01:07:39 +03:00 |
|
Nikolay Volf
|
453d880999
|
resolving frontier conflicts
|
2016-02-16 01:01:03 +03:00 |
|
Arkadiy Paronyan
|
482292551b
|
Merge pull request #423 from ethcore/secret-store
Secret store (part1 - key management)
|
2016-02-15 20:29:54 +01:00 |
|
Nikolay Volf
|
017a1adb24
|
fixing issues and moving
|
2016-02-15 18:01:52 +03:00 |
|
Nikolay Volf
|
31762095b7
|
Merge branch 'master' into secret-store
|
2016-02-15 17:19:04 +03:00 |
|
Marek Kotewicz
|
e1fe4a3871
|
Merge pull request #438 from ethcore/currecttransition
Use 1100000 as the homestead transition, fix build instructions.
|
2016-02-15 14:21:48 +01:00 |
|
Gav Wood
|
75197f4586
|
Update keys_directory.rs
|
2016-02-15 14:21:45 +01:00 |
|
Gav Wood
|
9f03640a06
|
Merge pull request #420 from ethcore/net
More sync and propagation fixes
|
2016-02-15 14:06:36 +01:00 |
|
Gav Wood
|
38a568e426
|
Use 1100000 as the homestead transition, fix build instructions.
|
2016-02-15 13:49:44 +01:00 |
|
arkpar
|
f141e69671
|
Added test for restart on malformed block
|
2016-02-15 13:34:58 +01:00 |
|
arkpar
|
b503fb5de8
|
Merge branch 'master' of github.com:ethcore/parity into net
|
2016-02-15 12:57:19 +01:00 |
|
Marek Kotewicz
|
e7864c301c
|
Merge pull request #436 from ethcore/cargo_packages
back to cargo crates
|
2016-02-15 11:58:02 +01:00 |
|
Marek Kotewicz
|
d62d78a0fc
|
Merge pull request #435 from ethcore/clippy_warnings
Fixing clippy warnings
|
2016-02-15 10:48:47 +01:00 |
|
debris
|
874dcdd840
|
back to cargo crates
|
2016-02-15 10:47:56 +01:00 |
Tomusdrw
|
2c4700f4c1
|
Fixing clippy warnings
|
2016-02-15 00:55:45 +01:00 |
|
Gav Wood
|
5b6e47c56f
|
Merge pull request #434 from ethcore/cargo-lock
preserving root cargo lock
|
2016-02-14 20:26:41 +01:00 |
|
Nikolay Volf
|
3c82e4865d
|
ignore updates
|
2016-02-14 20:49:36 +03:00 |
|
arkpar
|
d496523021
|
Merge branch 'net' of github.com:ethcore/parity into net
|
2016-02-14 18:09:11 +01:00 |