Gav Wood
aedc65dbbf
Merge branch 'master' of github.com:ethcore/parity
2016-02-21 21:46:17 +01:00
Gav Wood
fbee46d69d
Fix netstats.
2016-02-21 21:45:56 +01:00
Nikolay Volf
a8f4d24dad
Merge branch 'master' into geth-import
2016-02-21 23:44:52 +03:00
Nikolay Volf
8bc0b7c77c
import pub
2016-02-21 23:44:12 +03:00
Gav Wood
0477d245bc
Merge pull request #486 from ethcore/gitversion
...
Include git commit date & hash.
2016-02-21 21:41:20 +01:00
Nikolay Volf
5b05cbb128
extended keys with accont meta
2016-02-21 23:23:46 +03:00
Gav Wood
0c832853b6
Avoid the dep = "*"
2016-02-21 21:22:11 +01:00
Gav Wood
ea187253a2
Include git commit date & hash.
2016-02-21 21:14:09 +01:00
Gav Wood
22ff5bb7d7
Merge pull request #485 from ethcore/properversion
...
Use proper version string.
2016-02-21 20:23:37 +01:00
Gav Wood
6fa2284c68
Remove unneeded deps.
2016-02-21 20:03:01 +01:00
Gav Wood
63bbd0ccd8
Use proper version string.
2016-02-21 20:00:45 +01:00
Gav Wood
75129613c5
Merge pull request #480 from ethcore/network
...
Networking fixes
2016-02-21 18:57:10 +01:00
arkpar
67cd29f4e1
Whitespaces
2016-02-21 16:58:56 +01:00
arkpar
91276ad82e
Added comments
2016-02-21 16:52:25 +01:00
Gav Wood
8b50fa658f
Fix typo in deps script.
2016-02-21 16:32:11 +01:00
Gav Wood
8b692e6d9d
Merge pull request #484 from ethcore/discovery
...
Fix potential deadlock on node table update
2016-02-21 15:11:13 +01:00
arkpar
fe84eb4ff6
Fix locking
2016-02-21 14:04:10 +01:00
Nikolay Volf
bcc4ca48ab
to new namespace
2016-02-21 15:19:08 +03:00
Nikolay Volf
a6316b1e20
Merge branch 'master' into db
2016-02-21 15:05:36 +03:00
Peter
ce81a24bfd
Tests for issue #161
...
Implementations of get_cache_size and get_data_size in Rust (issue #161 )
Removed sizes module, containing replaced data tables
Fixed whitespace issues after code review
2016-02-21 02:11:09 +00:00
arkpar
93d259e8cb
Merge branch 'master' of github.com:ethcore/parity into network
2016-02-21 00:11:32 +01:00
Gav Wood
6448d073a7
Merge pull request #481 from ethcore/warnings
...
Squash more warnings
2016-02-20 22:00:08 +01:00
Gav Wood
26ad918e03
Merge pull request #477 from ethcore/temp-path
...
dev/test/build tools to separate crate
2016-02-20 21:59:59 +01:00
arkpar
7bc2853de9
Removed TODO
2016-02-20 15:14:54 +01:00
arkpar
8bd052b986
Fixed warnings
2016-02-20 11:54:12 +01:00
arkpar
b1bfd00875
Zombie connections
2016-02-20 11:47:39 +01:00
Nikolay Volf
0b48507d39
Delete LICENSE.txt
2016-02-20 12:38:16 +03:00
arkpar
69df91de68
Deregister handshake properly when converting to session
2016-02-20 01:36:08 +01:00
arkpar
00f2c6e3e4
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-20 00:48:36 +01:00
Gav Wood
b66f88181a
Merge pull request #479 from ethcore/network
...
Back to original slab crate
2016-02-20 00:25:17 +01:00
Gav Wood
548f77d6d3
Merge pull request #476 from ethcore/usererrors
...
Better user errors.
2016-02-20 00:24:59 +01:00
arkpar
e64d3daa06
exclude common headers from coverage
2016-02-19 20:14:28 +01:00
Gav Wood
dc3ceeb5bb
Use new is_valid_node_url function.
2016-02-19 20:02:23 +01:00
Gav Wood
5f164e1c98
Merge branch 'master' of github.com:ethcore/parity
2016-02-19 19:55:26 +01:00
Gav Wood
6c82e405dd
Remove regex &c., use network code for enode ID.
2016-02-19 19:42:23 +01:00
arkpar
5572d1792d
Back to original slab crate
2016-02-19 18:43:55 +01:00
Nikolay Volf
84e7ce2758
Merge branch 'master' into temp-path
...
Conflicts:
util/Cargo.toml
util/src/lib.rs
2016-02-19 19:11:24 +03:00
Gav Wood
6518576a3f
Merge pull request #440 from ethcore/discovery
...
UDP Discovery
2016-02-19 16:57:40 +01:00
arkpar
2a1d984bf1
exclude common headers from coverage
2016-02-19 16:41:05 +01:00
arkpar
ab233a941f
Slightly improved tests
2016-02-19 16:34:31 +01:00
arkpar
9648081abe
exclude common headers from coverage
2016-02-19 16:14:17 +01:00
Nikolay Volf
ab0fe65f3f
unlisting as dev-dependencies
2016-02-19 18:09:31 +03:00
debris
3253d2a17b
fixed ethsync tests compile errors and warnings
2016-02-19 15:34:12 +01:00
Nikolay Volf
bd18b4930d
license for random_path.rs
2016-02-19 17:20:02 +03:00
Nikolay Volf
fed90c126e
dev/test tools to separate crate
2016-02-19 17:18:20 +03:00
arkpar
2f62994f61
Updated cargo.lock
2016-02-19 15:17:31 +01:00
debris
ec428c070b
added trailing ,
2016-02-19 14:17:04 +01:00
arkpar
beab90c707
Added is_valid_node_url
2016-02-19 14:13:20 +01:00
debris
a760f5263f
Merge branch 'jsonrpc2' of github.com:ethcore/parity into jsonrpc2
2016-02-19 14:08:33 +01:00
debris
8113c689fc
Merge branch 'master' into jsonrpc2
2016-02-19 14:07:11 +01:00
