Commit Graph

2314 Commits

Author SHA1 Message Date
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
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
Gav Wood 5917290562 Remove unneeded code, fix minor potential issue with length. 2016-02-22 13:59:25 +01:00
Gav Wood 64d566ff52 Manage final user-input errors. 2016-02-22 13:58:41 +01:00
debris 5e27e1b9aa Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-22 11:08:51 +01:00
Marek Kotewicz 38ccc24577 Merge pull request #488 from ethcore/shortversio
Remove "unknown" from version string.
2016-02-22 10:54:34 +01:00
debris 2be4f2f737 added trailin , 2016-02-22 10:14:31 +01:00
debris 8f4c2d98ba added trailin , 2016-02-22 10:11:07 +01:00
debris 61e1720d07 fork back tests 2016-02-22 09:54:56 +01:00
debris 4adb7ee969 tests for blockchain reseting chain head and rebuilding blooms 2016-02-22 09:12:15 +01:00
Gav Wood e63aba73c5 Remove "unknown" from version string. 2016-02-22 09:04:44 +01:00
debris 155404bf92 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-22 08:50:03 +01:00
debris 8db8e5b5f8 unit tests for reset chain head 2016-02-22 08:46:47 +01:00
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
Gav Wood 0477d245bc Merge pull request #486 from ethcore/gitversion
Include git commit date & hash.
2016-02-21 21:41:20 +01: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 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
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
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
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