Commits · 5f742c914290f5f1b6f32d352e737ae0296c5e6c · ddorgan / parity-ethereum

Feb 10, 2016
- Fix test. · 5f742c91
  Gav Wood authored Feb 11, 2016
  
  5f742c91
- Merge branch 'master' into cliopt · b4faad84
  Gav Wood authored Feb 10, 2016
  
  b4faad84
- Install both rocksdb deps. · 3e49c960
  Gav Wood authored Feb 10, 2016
  
  3e49c960
- Fix deps script again. · cb097681
  Gav Wood authored Feb 10, 2016
  
  cb097681
- Merge branch 'master' of github.com:ethcore/parity · 30f291e6
  Gav Wood authored Feb 10, 2016
  
  30f291e6
- Fix deps script. · 25c3e49b
  Gav Wood authored Feb 10, 2016
  
  25c3e49b
- Allow path to be configured. · 9ac4f516
  Gav Wood authored Feb 10, 2016
  
  9ac4f516
- Merge pull request #400 from ethcore/upnp · 428962df
  Nikolay Volf authored Feb 10, 2016
```
Upnp
```
  428962df
- Merge pull request #398 from ethcore/jsonrpc2 · 0f665a6c
  Arkadiy Paronyan authored Feb 10, 2016
```
eth_syncing, fixed #397
```
  0f665a6c
- Merge pull request #399 from ethcore/sigterm · 1d60e38f
  Gav Wood authored Feb 10, 2016
```
Using modified version of ctrlc that catches SIGTERM
```
  1d60e38f
- Revert collecting trie stats. · 0e679fbe
  Gav Wood authored Feb 10, 2016
  
  0e679fbe
- fixed protocol_version, hash_rate, block_number and gas_price methods · 2c360d6c
  Marek Kotewicz authored Feb 10, 2016
  
  2c360d6c
- Revert printing trie insertion stats. · e8aaf26a
  Gav Wood authored Feb 10, 2016
  
  e8aaf26a
- Synchronous UPnP. · 637ca97d
  Gav Wood authored Feb 10, 2016
  
  637ca97d
- eth_syncing use best_block_hash instead of last_imported_block_number · a938ac67
  Marek Kotewicz authored Feb 10, 2016
  
  a938ac67
- Merge branch 'master' of github.com:ethcore/parity · 39d5b687
  Gav Wood authored Feb 10, 2016
  
  39d5b687
- Merge pull request #396 from ethcore/close_gently · 66a370af
  Nikolay Volf authored Feb 10, 2016
```
Catching panics.
```
  66a370af
- Using modified version of ctrlc that catches SIGTERM · d7a36f4a
  Tomusdrw authored Feb 10, 2016
  
  d7a36f4a
- Merge branch 'master' of github.com:ethcore/parity · 5c73c298
  Gav Wood authored Feb 10, 2016
  
  5c73c298
- Start of UPnP. · 35374ac0
  Gav Wood authored Feb 10, 2016
  
  35374ac0
- Forwarding panics from threads · 96dda7b7
  Tomusdrw authored Feb 10, 2016
  
  96dda7b7
- Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 · 373f0da5
  Marek Kotewicz authored Feb 10, 2016
  
  373f0da5
- eth_syncing, fixed #397 · 9159d581
  Marek Kotewicz authored Feb 10, 2016
  
  9159d581
- Merge pull request #391 from ethcore/jsonrpc2 · e69cd0f8
  Marek Kotewicz authored Feb 10, 2016
```
jsonrpc
```
  e69cd0f8
- Removing overengineered stuff · 7925642b
  Tomusdrw authored Feb 10, 2016
  
  7925642b
- changed BlockPosition -> Location · 5347d4fe
  Marek Kotewicz authored Feb 10, 2016
  
  5347d4fe
- moved BlockId and TransactionId to blockchain.rs · dc8fa4eb
  Marek Kotewicz authored Feb 10, 2016
  
  dc8fa4eb
- Removing unecessary locks causing dead-locks · 0d121dd5
  Tomusdrw authored Feb 10, 2016
  
  0d121dd5
- Fixing parity build · 31bcc541
  Tomusdrw authored Feb 10, 2016
  
  31bcc541
- Merge branch 'master' into close_gently · 6b0cc0c8
  Tomusdrw authored Feb 10, 2016
```
Conflicts:
	parity/main.rs
```
  6b0cc0c8
- Implementing PanicHandlers for all places when new thread is spawned. Handling Client panics · 2a498fc3
  Tomusdrw authored Feb 10, 2016
  
  2a498fc3
- updated BlockId and TransactionId description · 75b54cc2
  Marek Kotewicz authored Feb 10, 2016
  
  75b54cc2
- fixed Uniquely typo · 8c43c989
  Marek Kotewicz authored Feb 10, 2016
  
  8c43c989
- fixed ethsync tests · 7491815e
  Marek Kotewicz authored Feb 10, 2016
  
  7491815e
- block and transaction ids, jsonrpcs eth_getTransactionByHash · 626277ef
  Marek Kotewicz authored Feb 10, 2016
  
  626277ef
- Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 · b86ddbb9
  Marek Kotewicz authored Feb 10, 2016
  
  b86ddbb9
- small clenaup · bceae29f
  Marek Kotewicz authored Feb 10, 2016
  
  bceae29f
- Merge pull request #394 from ethcore/ext-tests · 9f8766c8
  Gav Wood authored Feb 10, 2016
```
Externalities tests (still clumsy)
```
  9f8766c8
- Merge pull request #395 from ethcore/coverage-reasonable · f0e26e34
  Gav Wood authored Feb 10, 2016
```
excluding test code itself from coverage
```
  f0e26e34
- excluding test code itself from coverage · 92a08c26
  Nikolay Volf authored Feb 10, 2016
  
  92a08c26