Commit Graph

2253 Commits

Author SHA1 Message Date
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
Gav Wood 6518576a3f Merge pull request #440 from ethcore/discovery
UDP Discovery
2016-02-19 16:57:40 +01:00
arkpar ab233a941f Slightly improved tests 2016-02-19 16:34:31 +01:00
Nikolay Volf ab0fe65f3f unlisting as dev-dependencies 2016-02-19 18:09:31 +03: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 beab90c707 Added is_valid_node_url 2016-02-19 14:13:20 +01:00
Gav Wood fd71e1395c Merge branch 'master' of github.com:ethcore/parity 2016-02-19 13:55:00 +01:00
arkpar 85c842b7fd Restored service test 2016-02-19 13:47:13 +01:00
arkpar 1d60d82698 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:44:57 +01:00
arkpar d9fec87143 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:39:43 +01:00
Gav Wood 1866174327 Merge pull request #475 from ethcore/multirust-override
update readme with rust override
2016-02-19 13:31:28 +01:00
Gav Wood 8747fe2dc9 Merge pull request #449 from ethcore/secret-store-enc
Secret store (part2 - encrypted key/value svc)
2016-02-19 13:30:45 +01:00
Gav Wood d43b23d663 Update directory.rs 2016-02-19 13:30:36 +01:00
Gav Wood 9dfa54a6b7 Merge pull request #474 from ethcore/rustbeta
fixed warnings on rust beta
2016-02-19 13:28:49 +01:00
Nikolay Volf fe979f0d46 [ci skip] update readme with rust override 2016-02-19 15:21:52 +03:00
Gav Wood 2cc690f31f Better user errors.
Fixed up README.
2016-02-19 12:54:51 +01:00
Nikolay Volf 63c5a2e58f copy instead of ref-map 2016-02-19 14:52:29 +03:00
debris ecde760b42 Merge branch 'master' of github.com:ethcore/parity into rustbeta 2016-02-19 12:40:30 +01:00
debris b5d6359030 fixed allow warnings in ethcore 2016-02-19 12:40:23 +01:00
Arkadiy Paronyan 57ef5e2691 Merge pull request #473 from ethcore/killtest
Kill bad test.
2016-02-19 12:36:36 +01:00
Nikolay Volf 25bae2897b [ci skip] merging master 2016-02-19 14:25:51 +03:00
Gav Wood 1cd76de8ba Update readme for betaUpdate readme for beta 2016-02-19 11:57:59 +01:00
debris f50bf528e6 fixed allow warnings in util 2016-02-19 11:57:52 +01:00
Gav Wood 33b649bb01 Update script. 2016-02-19 11:57:04 +01:00
Gav Wood 4f6bff1c47 Kill bad test. 2016-02-19 11:39:36 +01:00
Gav Wood a4846e4aad Update bytes.rs 2016-02-19 11:31:40 +01:00