Commits · b503fb5de88c646a28a7de4f0d9a438813391500 · ddorgan / parity-ethereum

Feb 15, 2016
- Merge branch 'master' of github.com:ethcore/parity into net · b503fb5d
  Arkadiy Paronyan authored Feb 15, 2016
  
  b503fb5d
- Merge pull request #436 from ethcore/cargo_packages · e7864c30
  Marek Kotewicz authored Feb 15, 2016
```
back to cargo crates
```
  e7864c30
- Merge pull request #435 from ethcore/clippy_warnings · d62d78a0
  Marek Kotewicz authored Feb 15, 2016
```
Fixing clippy warnings
```
  d62d78a0
- back to cargo crates · 874dcdd8
  Marek Kotewicz authored Feb 15, 2016
  
  874dcdd8
Feb 14, 2016
- Fixing clippy warnings · 2c4700f4
  Tomusdrw authored Feb 15, 2016
  
  2c4700f4
- Merge pull request #434 from ethcore/cargo-lock · 5b6e47c5
  Gav Wood authored Feb 14, 2016
```
preserving root cargo lock
```
  5b6e47c5
- ignore updates · 3c82e486
  Nikolay Volf authored Feb 14, 2016
  
  3c82e486
- Merge branch 'net' of github.com:ethcore/parity into net · d4965230
  Arkadiy Paronyan authored Feb 14, 2016
  
  d4965230
- Update last imported number on new block · 8b0ec51c
  Arkadiy Paronyan authored Feb 14, 2016
  
  8b0ec51c
- Merge branch 'master' of github.com:ethcore/parity into net · 76590d5a
  Arkadiy Paronyan authored Feb 14, 2016
  
  76590d5a
- Propagate only one last hash for peers that are too far behind · debf1ed9
  Arkadiy Paronyan authored Feb 14, 2016
  
  debf1ed9
- preserving root cargo lock · 304173f5
  Nikolay Volf authored Feb 14, 2016
  
  304173f5
- Merge branch 'master' into net · c50a6872
  Nikolay Volf authored Feb 14, 2016
  
  c50a6872
- Merge pull request #432 from ethcore/nightly-fix · c1ab00d9
  Nikolay Volf authored Feb 14, 2016
```
Nightly fix
```
  c1ab00d9
- ignore transition tests for now, make travis build green again · 9e0cfa1f
  Marek Kotewicz authored Feb 14, 2016
  
  9e0cfa1f
- Merge branch 'master' of github.com:ethcore/parity into nightly-fix · 0502951b
  Marek Kotewicz authored Feb 14, 2016
  
  0502951b
- fixed util benches on nighly · 3ffaed98
  Marek Kotewicz authored Feb 14, 2016
  
  3ffaed98
- Merge pull request #431 from ethcore/nightly-fix · ef059911
  Gav Wood authored Feb 14, 2016
```
nightly fixes
```
  ef059911
- nightly fixes · f1b39ee1
  Marek Kotewicz authored Feb 14, 2016
  
  f1b39ee1
- Merge pull request #429 from ethcore/homesteaddelay · 398a8397
  Nikolay Volf authored Feb 14, 2016
```
Delay Homestead transition from 1,000,000.
```
  398a8397
- Delay in test frontier file. · b821412f
  Gav Wood authored Feb 14, 2016
  
  b821412f
- Delay Homestead transition from 1,000,000. · 48f657c0
  Gav Wood authored Feb 14, 2016
  
  48f657c0
- Merge pull request #428 from ethcore/fix-nightly-2 · e1cd5186
  Marek Kotewicz authored Feb 14, 2016
```
Nightly fix effort (still should fail)
```
  e1cd5186
Feb 13, 2016
- clippy, returing docopt · 9ff3155a
  Nikolay Volf authored Feb 14, 2016
  
  9ff3155a
- trigger build · 2205b807
  Nikolay Volf authored Feb 13, 2016
  
  2205b807
- Merge pull request #425 from ethcore/fix-nightly · 254b8559
  Marek Kotewicz authored Feb 13, 2016
```
clippy version update, docopt-macro moving to fork
```
  254b8559
- fixed build · 3a09b2f2
  Marek Kotewicz authored Feb 13, 2016
  
  3a09b2f2
- clippy version update, docopt-macro moving to fork · 84c75258
  Nikolay Volf authored Feb 13, 2016
  
  84c75258
Feb 12, 2016
- Fixed random failing test · fcd0dafb
  Arkadiy Paronyan authored Feb 12, 2016
  
  fcd0dafb
- Check for peer registration · 34b465a1
  Arkadiy Paronyan authored Feb 12, 2016
  
  34b465a1
- More sync and propagation fixes · f74c5dc9
  Arkadiy Paronyan authored Feb 12, 2016
  
  f74c5dc9
- Merge pull request #416 from ethcore/net · 23d2899e
  Gav Wood authored Feb 12, 2016
```
Network/Sync fixes and optimizations
```
  23d2899e
Feb 11, 2016
- Update main.rs · 3575e6bb
  Gav Wood authored Feb 12, 2016
  
  3575e6bb
- Minor fixes · 01d9ffcd
  Arkadiy Paronyan authored Feb 11, 2016
  
  01d9ffcd
- Merge branch 'master' of github.com:ethcore/parity into net · 62ac80d5
  Arkadiy Paronyan authored Feb 11, 2016
  
  62ac80d5
- Sync fixes · 84732d4b
  Arkadiy Paronyan authored Feb 11, 2016
  
  84732d4b
- Merge pull request #414 from ethcore/state · 0a41dedc
  Gav Wood authored Feb 11, 2016
```
Use latest era instead of end era as journal marker
```
  0a41dedc
- Merge branch 'master' of github.com:ethcore/parity into net · aed348ce
  Arkadiy Paronyan authored Feb 11, 2016
  
  aed348ce
- Fixed one extra block/header being requested · f4d8070b
  Arkadiy Paronyan authored Feb 11, 2016
  
  f4d8070b
- Merge pull request #402 from ethcore/jsonrpc2 · 6c8f82d8
  Arkadiy Paronyan authored Feb 11, 2016
```
api changes
```
  6c8f82d8