Commit Graph

1644 Commits

Author SHA1 Message Date
Gav Wood
eda65b0e36 Merge branch 'master' of github.com:ethcore/parity 2016-02-02 23:44:36 +01:00
Gav Wood
78adec5e53 Document some stuff. 2016-02-02 23:43:29 +01:00
Gav Wood
5155ff1fac Merge pull request #303 from ethcore/ark
Check block parent on import; Peer timeouts
2016-02-02 22:40:06 +01:00
Gav Wood
73d71f459f Merge pull request #306 from ethcore/evm-cov-test
Increasing coverage for evm.
2016-02-02 21:11:14 +01:00
arkpar
da52fee2b3 Simplified Disconnect struct 2016-02-02 21:10:16 +01:00
arkpar
6e717c017f Fixed queue test 2016-02-02 21:06:21 +01:00
arkpar
05e86ca63c Peers keep-alive 2016-02-02 20:58:12 +01:00
Gav Wood
27e585191e Merge branch 'master' of github.com:ethcore/parity 2016-02-02 19:41:08 +01:00
Gav Wood
77794bc4b3 Add installation dependencies script. 2016-02-02 19:40:45 +01:00
Tomusdrw
285621cfa9 Merge branch 'master' into evm-cov-test
Conflicts:
	ethcore/src/evm/factory.rs
2016-02-02 18:21:55 +01:00
Tomusdrw
270c6c1897 Adding pop & badinstruction tests 2016-02-02 18:16:24 +01:00
Gav Wood
9ff75df73c Merge pull request #301 from ethcore/ethcore_docs
ethcore docs
2016-02-02 18:11:38 +01:00
Tomusdrw
366f9fe8f2 Couple of tests for EVM 2016-02-02 18:02:58 +01:00
Marek Kotewicz
ac4d5aff45 Merge pull request #305 from ethcore/travis-deploy
Replacing secure token for deployment
2016-02-02 17:51:42 +01:00
Tomusdrw
1260a4c36d Replacing secure token for deployment 2016-02-02 17:37:37 +01:00
Arkadiy Paronyan
9ac67d9341 Merge pull request #299 from ethcore/doc.sh
doc.sh
2016-02-02 17:33:29 +01:00
arkpar
81e339a77a Merge 2016-02-02 17:00:32 +01:00
Marek Kotewicz
ccc3bf7951 Merge pull request #302 from ethcore/travis-deploy
Building beta-* and stable-* tags
2016-02-02 16:36:08 +01:00
debris
38dfa18e8c gzip64res_to_json is no longer public 2016-02-02 16:35:11 +01:00
debris
e9a516e4dc make ethcore block_queue module public 2016-02-02 16:27:37 +01:00
debris
a1cedaa994 ethcore block and blockchain module fixes 2016-02-02 16:24:37 +01:00
Tomusdrw
8ea7331d2b Building beta-* and stable-* tags 2016-02-02 16:13:42 +01:00
Marek Kotewicz
58757cc46c Merge pull request #300 from ethcore/travis-deploy
Deploying artifacts for tags (release/beta)
2016-02-02 16:05:22 +01:00
debris
cb98cbcd4b ethcore public interface cleanup 2016-02-02 15:55:44 +01:00
debris
30dc9d857d cleanup ethcore public interfaces 2016-02-02 15:29:53 +01:00
Tomusdrw
8f12989785 Changing packaging to tar.gz 2016-02-02 15:01:18 +01:00
debris
b3eb2b26d5 Merge branch 'doc.sh' into ethcore_docs 2016-02-02 14:59:01 +01:00
arkpar
ce0cc11c56 Peer sync timeouts 2016-02-02 14:54:46 +01:00
Arkadiy Paronyan
60aa0d6799 Merge pull request #298 from ethcore/nvolf
cov.sh to show coverage locally
2016-02-02 14:48:10 +01:00
Tomusdrw
25c87d0004 Including OS_NAME in artifact 2016-02-02 14:43:55 +01:00
Tomusdrw
3f8fdfaea7 Deploying artifacts for releases 2016-02-02 14:33:02 +01:00
debris
70dee5ecc1 doc.sh 2016-02-02 14:31:12 +01:00
Nikolay Volf
33499fd698 package spec 2016-02-02 03:32:28 -08:00
Nikolay Volf
b119e2cbb1 removed trash 2016-02-02 03:26:19 -08:00
Nikolay Volf
6c10bb3247 local coverage 2016-02-02 03:24:31 -08:00
arkpar
bd684e3732 Check for parent on queue import 2016-02-02 12:12:32 +01:00
Gav Wood
e36c22e0b0 Merge pull request #297 from ethcore/travis_fixes
benchmark fixes
2016-02-02 09:03:59 +01:00
debris
620146bdda uncomment rlp benches 2016-02-02 02:38:15 +01:00
debris
21913b29b5 Merge branch 'master' into travis_fixes 2016-02-02 02:37:43 +01:00
Marek Kotewicz
d688fa0622 Merge pull request #296 from ethcore/jsonrpcclioptions
Include JSONRPC CLI options.
2016-02-02 02:37:09 +01:00
debris
3d6f5a6ca7 fixed typo in travis.yml 2016-02-02 02:32:58 +01:00
debris
26652a2ed8 fixed rlp benchmarks 2016-02-02 02:31:17 +01:00
debris
baec2909b6 added dumb tests for parity and ethcore-rpc to include them in coverage reports, added TARGETS env variable to travis.yml 2016-02-02 02:04:03 +01:00
Gav Wood
2915c98ebb Merge pull request #293 from ethcore/travis_fixes
travis.yml fixes
2016-02-02 02:01:46 +01:00
Gav Wood
54924d14b3 Include JSONRPC CLI options.
Bump version numbers.
Update Trie benchmarks.
Disable RLP benchmark (@debrid please fix).
2016-02-02 01:59:14 +01:00
debris
21de5562d7 another attempt to fix build matrix 2016-02-02 01:18:27 +01:00
debris
63950aa1a2 fixed travis matrix env 2016-02-02 01:15:22 +01:00
debris
ba62e757e0 Merge branch 'master' into travis_fixes 2016-02-02 01:13:21 +01:00
debris
8e66f193d8 fixed env variables 2016-02-02 01:13:19 +01:00
Marek Kotewicz
ab8ee51fed Merge pull request #295 from ethcore/improveversionstring
Improve version string.
2016-02-01 19:54:59 +01:00