Commit Graph

12209 Commits

Author SHA1 Message Date
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
Gav Wood
4fc9137633 Merge pull request #294 from ethcore/ark
Fixed block queue test
2016-02-01 17:59:47 +01:00
Gav Wood
fdd42ae537 Improve version string. 2016-02-01 17:57:22 +01:00
Gav Wood
4a25476161 Merge pull request #292 from ethcore/util_docs
Util docs
2016-02-01 16:21:45 +01:00
Gav Wood
9ec2efb2f3 Update mod.rs 2016-02-01 16:20:46 +01:00
Gav Wood
205a1990d6 Update mod.rs 2016-02-01 16:19:59 +01:00
arkpar
5db17514fd Fixed block queue test 2016-02-01 16:18:32 +01:00
debris
09ebc924a6 json tests are not run in default configuration, faster travis build, fixed coverage for ethcore-rpc and ethash 2016-02-01 16:03:43 +01:00
Marek Kotewicz
f0bd77d00c Merge pull request #289 from ethcore/docs
fixed building docs
2016-02-01 15:38:30 +01:00
debris
2bddc938af util docs 2016-02-01 15:22:42 +01:00
Gav Wood
614522248d Merge pull request #290 from ethcore/travis_master
update travis to build PRs only against master
2016-02-01 15:08:37 +01:00
Gav Wood
e509bff5da Merge pull request #272 from ethcore/coverage-effort
Coverage effort
2016-02-01 15:07:42 +01:00
Gav Wood
79258a9912 Update journaldb.rs 2016-02-01 15:07:11 +01:00
debris
6ec672a1a6 docs for util standard, from_json and common modules 2016-02-01 14:58:13 +01:00
debris
4f68ff5beb Merge branch 'travis_master' into util_docs 2016-02-01 14:52:20 +01:00
debris
fcd8e95758 update travis to build PRs only against master 2016-02-01 14:49:46 +01:00
debris
ea13fd3c0e util docs cleanup pt.1 2016-02-01 14:48:38 +01:00
debris
735af1e9d7 add missing && to .travis.yml 2016-02-01 14:28:24 +01:00
debris
f8501d7203 build docs for all ethcore libs 2016-02-01 14:26:52 +01:00
Gav Wood
694590e19d Merge pull request #288 from ethcore/docker
updated docker containers
2016-02-01 13:48:30 +01:00
Nikolay Volf
77fdef4fb0 Merge branch 'master' into coverage-effort
Conflicts:
	ethcore/src/receipt.rs
2016-02-01 16:37:08 +04:00
Nikolay Volf
e0e8ba01ed accrue expanded 2016-02-01 16:29:12 +04:00
Marek Kotewicz
fd1729a82a Merge pull request #287 from ethcore/rpc_fixes
rpc module fixes
2016-02-01 12:56:30 +01:00
debris
fc1610acb8 updated docker containers 2016-02-01 12:35:52 +01:00
Nikolay Volf
cf963b1957 more of env_info 2016-02-01 15:35:13 +04:00
Arkadiy Paronyan
f08703bbfc Merge pull request #282 from ethcore/receipttest
Test for Receipt RLP.
2016-02-01 12:20:09 +01:00
debris
d418562647 add rpc module to travis tests and to coverage check 2016-02-01 12:13:41 +01:00
debris
3000f057e4 fixed building rpc module 2016-02-01 12:08:43 +01:00
Gav Wood
cbc5bfcb46 Merge pull request #284 from ethcore/debris-patch-2
Building from source guide
2016-02-01 11:29:12 +01:00
Gav Wood
21e5399d8c Update README.md 2016-02-01 11:28:56 +01:00
Gav Wood
3533447f7a Update README.md 2016-02-01 11:27:46 +01:00
Marek Kotewicz
bedc27c90f install multirust through homebrew on osx 2016-02-01 11:10:36 +01:00
Gav Wood
78e514b527 Fix test. 2016-02-01 11:00:18 +01:00
Marek Kotewicz
86459bc5aa Update README.md 2016-02-01 10:43:27 +01:00
Gav Wood
6b6b9c72e2 Merge branch 'master' of github.com:ethcore/parity 2016-02-01 10:28:10 +01:00
Gav Wood
9ed8f14e45 Merge pull request #283 from ethcore/ark
Fixed neted empty list RLP encoding
2016-02-01 10:27:39 +01:00