Commits · 304173f5955ccfe00dd5b4874a066d30477a0343 · ddorgan / parity-ethereum

Feb 14, 2016
- preserving root cargo lock · 304173f5
  Nikolay Volf authored Feb 14, 2016
  
  304173f5
- 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
- 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
- Merge branch 'master' of github.com:ethcore/parity into net · 64b15cdb
  Arkadiy Paronyan authored Feb 11, 2016
  
  64b15cdb
- net-key option · 6281d182
  Arkadiy Paronyan authored Feb 11, 2016
  
  6281d182
- Use latest era instead of end era as journal marker · 0d0441a1
  Arkadiy Paronyan authored Feb 11, 2016
  
  0d0441a1
- Merge branch 'master' of github.com:ethcore/parity · 413502e7
  Gav Wood authored Feb 11, 2016
  
  413502e7
- Deps script. · 3bfe8bea
  Gav Wood authored Feb 11, 2016
  
  3bfe8bea
- Merge pull request #408 from ethcore/noinitnodes · 7b476358
  Arkadiy Paronyan authored Feb 11, 2016
```
Option for no init nodes.
```
  7b476358
- Option for no init nodes. · 439e99d3
  Gav Wood authored Feb 11, 2016
  
  439e99d3
- Add contributing agreement. · 25e2e382
  Gav Wood authored Feb 11, 2016
  
  25e2e382
- Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 · b0f2ae14
  Marek Kotewicz authored Feb 11, 2016
  
  b0f2ae14
- Merge pull request #406 from ethcore/net · 50a6e90e
  Nikolay Volf authored Feb 11, 2016
```
Fixed block_bodies not returning a list
```
  50a6e90e
- Merge pull request #405 from ethcore/cliopt · 83c4a05d
  Arkadiy Paronyan authored Feb 11, 2016
```
Fix test.
```
  83c4a05d
- Fixed block_bodies not returning a list · 7bb661e2
  Arkadiy Paronyan authored Feb 11, 2016
  
  7bb661e2
- fixing tests and build · ebe3990d
  Nikolay Volf authored Feb 11, 2016
  
  ebe3990d
Feb 10, 2016
- Fix test. · 5f742c91
  Gav Wood authored Feb 11, 2016
  
  5f742c91
- Merge pull request #404 from ethcore/cliopt · 61c8f7b0
  Arkadiy Paronyan authored Feb 10, 2016
```
Allow path to be configured.
```
  61c8f7b0