Commit Graph

2371 Commits

Author SHA1 Message Date
arkpar
10ef7123c4 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-26 13:55:42 +01:00
arkpar
2e66ba7b64 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-26 13:53:01 +01:00
Gav Wood
6e5ae636cc Merge pull request #464 from ethcore/db
RocksDB abstraction layer + Hash index for state DB
2016-02-26 13:51:13 +01:00
arkpar
9920dcea17 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-26 13:16:22 +01:00
Gav Wood
7a706fa0d2 Merge pull request #418 from ethcore/jsonrpc2
bloomfilter
2016-02-26 13:08:41 +01:00
Nikolay Volf
9823e30c2e Merge pull request #519 from ethcore/net-fix
Fixed a race condition when connecting peer disconnects immediately
2016-02-26 14:48:15 +03:00
arkpar
c66178e3f7 Fixed a race condition when a connecting peer disconnects immediately 2016-02-26 11:38:06 +01:00
Arkadiy Paronyan
4af8657c21 Merge pull request #518 from wlk/fix-gitignore-for-intellij
ignore intellij idea project files as well
2016-02-26 10:53:22 +01:00
Wojciech Langiewicz
5545cbc6bc ignore intellij idea project files as well 2016-02-26 10:07:30 +01:00
arkpar
c76fc14a5c rocksdb dependency version bump 2016-02-26 03:22:18 +01:00
arkpar
4660612e08 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-25 20:52:31 +01:00
arkpar
937547f178 rocksdb dependency version bump 2016-02-25 20:20:00 +01:00
arkpar
c139b6bcbb Fixed json tests build 2016-02-25 17:48:23 +01:00
arkpar
0344f2b4c9 Block queue mem limit test 2016-02-25 17:14:45 +01:00
arkpar
bed89d0740 Fixed sync tests 2016-02-25 16:32:34 +01:00
arkpar
21f62012d6 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-25 14:22:41 +01:00
Arkadiy Paronyan
6b0be50dd0 Merge pull request #517 from ethcore/unicase_update
updated version of unicase
2016-02-25 14:22:22 +01:00
debris
85350f3c66 updated version of unicase 2016-02-25 14:21:29 +01:00
arkpar
1b9f428183 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-25 14:20:28 +01:00
arkpar
781f763f1f Memory management 2016-02-25 14:09:39 +01:00
Marek Kotewicz
ba464bbac4 Merge pull request #493 from ethcore/jsonrpc_security
jsonrpc security, cors headers, fixed #359
2016-02-25 14:08:18 +01:00
Nikolay Volf
b6a6bc0f4e Merge pull request #482 from peterjoel/issue_161
Rust implementations to replace data tables (#161)
2016-02-25 03:31:04 +03:00
Nikolay Volf
53af2d7dfb Merge pull request #512 from ethcore/fix-block-inclusive
fix issue with starting requested block number was not included itself
2016-02-25 02:09:28 +03:00
arkpar
1a73d70334 Report memory usage 2016-02-24 22:37:28 +01:00
arkpar
5a9bba3fa5 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-24 21:32:21 +01:00
arkpar
cb3608c6d3 Limit download ahead 2016-02-24 21:23:58 +01:00
Nikolay Volf
d4ad673d64 tested out 2016-02-24 15:01:45 +03:00
Nikolay Volf
d51942e59d fix issue with starting requested block number was not included itself 2016-02-24 14:36:41 +03:00
Marek Kotewicz
e519e162df Merge pull request #510 from ethcore/fixed_gh_token
fixed travis --org GH_TOKEN
2016-02-24 11:24:42 +01:00
debris
365218590c fixed travis --org GH_TOKEN 2016-02-24 11:19:27 +01:00
debris
da936d2e94 removed unused umports 2016-02-24 10:45:17 +01:00
debris
ca251215cf simplified filter iterators 2016-02-24 10:35:05 +01:00
debris
394e57d3ce removed unnecessary maps 2016-02-24 10:23:25 +01:00
debris
ad268d27d7 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-24 10:10:49 +01:00
Nikolay Volf
769e776ee4 Merge pull request #506 from ethcore/log
Improved log format
2016-02-23 23:19:52 +03:00
arkpar
40f908a499 Log formatting 2016-02-23 20:14:37 +01:00
Nikolay Volf
6fe189cbd9 Merge pull request #502 from ethcore/network
Log address on failed connection attempt
2016-02-23 17:59:50 +03:00
arkpar
492bf7154e Log address 2016-02-23 15:02:08 +01:00
debris
52ed69b619 Merge branch 'master' into jsonrpc2 2016-02-23 14:53:09 +01:00
Nikolay Volf
a05e8d226f Merge pull request #501 from ethcore/todr
Bumping clippy and fixing warnings.
2016-02-23 14:23:45 +03:00
Tomusdrw
3734959f55 Deriving PartialEq and disabling clippy warning 2016-02-23 11:54:10 +01:00
Tomusdrw
07e704c968 Fixing clippy warnings. Implementing PartialEq for Uints 2016-02-23 11:40:23 +01:00
Tomusdrw
c2952b49b4 Bumping clippy version Fixes #496 2016-02-23 10:47:57 +01:00
Nikolay Volf
cffaa3b2ee Merge pull request #500 from ethcore/todr
Bumping versions. Fixes #496
2016-02-23 12:34:15 +03:00
debris
bda778626c Merge branch 'master' into jsonrpc_security 2016-02-23 10:28:27 +01:00
Tomusdrw
60a8b92e10 Bumping versions. Fixes #496 2016-02-23 10:14:56 +01:00
Arkadiy Paronyan
4e023a1bb8 Merge pull request #494 from ethcore/usererrors
Manage final user-input errors.
2016-02-22 20:04:17 +01:00
Gav Wood
72d0719223 Update docs. 2016-02-22 18:11:53 +01:00
debris
4b69b96f9b added assert checking bloom index size 2016-02-22 15:14:35 +01:00
Arkadiy Paronyan
5fdc9c8adb Merge pull request #495 from ethcore/netcleanups
Remove unneeded code, fix minor potential issue with length.
2016-02-22 14:38:31 +01:00