Commit Graph

2672 Commits

Author SHA1 Message Date
Nikolay Volf
d7aa315309 Merge branch 'master' into remerge-264
Conflicts:
	sync/src/chain.rs
2016-02-04 04:35:38 +03:00
Arkadiy Paronyan
c5b81270a8 Merge pull request #335 from ethcore/fixoptions
Fix default options.
2016-02-04 02:31:41 +01:00
Arkadiy Paronyan
f904dc109a Merge pull request #338 from ethcore/sync-fix-temp
sync queue limit hotfix
2016-02-04 02:30:27 +01:00
Nikolay Volf
376c99c247 moving to mainaint_sync 2016-02-04 04:28:16 +03:00
Nikolay Volf
86cfe95113 continueing sync 2016-02-04 04:24:10 +03:00
Nikolay Volf
20ca72ee0c status waiting 2016-02-04 04:12:41 +03:00
Nikolay Volf
c3d0ed6e69 proper status setting 2016-02-04 04:11:27 +03:00
Nikolay Volf
a20600c9d1 verified as well 2016-02-04 04:04:12 +03:00
Nikolay Volf
ce7b5b03ad sync test temp fix 2016-02-04 03:44:40 +03:00
Gav Wood
8e892fe60e Remove println for options. 2016-02-04 00:48:51 +01:00
Gav Wood
f2b8d6336a Fix default options. 2016-02-04 00:48:36 +01:00
Nikolay Volf
d398b84802 remerge of 264 2016-02-03 23:42:30 +03:00
Nikolay Volf
edd41ac574 getting old one 2016-02-03 23:05:04 +03:00
Gav Wood
bb6115cbef Merge pull request #333 from ethcore/nvolf
Network tests, separate local coverage for utils
2016-02-03 20:58:54 +01:00
Nikolay Volf
99a8217bc4 Merge branch 'master' into nvolf 2016-02-03 22:53:22 +03:00
Nikolay Volf
98fc321733 separate coverage for util 2016-02-03 22:00:09 +03:00
Nikolay Volf
3f3ebdbfa1 nodes specs 2016-02-03 21:44:49 +03:00
arkpar
b9af3f9260 State copy optimization 2016-02-03 19:34:51 +01:00
Gav Wood
99a63d0639 Merge pull request #332 from ethcore/fixed_v
fix parity version so netstats can parse it
2016-02-03 19:32:49 +01:00
Nikolay Volf
f99151bf47 Merge branch 'master' into nvolf 2016-02-03 21:02:12 +03:00
Nikolay Volf
ec30a0a591 connection read tests 2016-02-03 21:01:39 +03:00
Marek Kotewicz
d59e7e3733 fix parity version so netstats can parse it 2016-02-03 12:43:58 -05:00
Arkadiy Paronyan
755b0815d3 Merge pull request #331 from ethcore/reveal_surprise
reveal surprise
2016-02-03 18:00:22 +01:00
Gav Wood
0b3acf7b13 Update web3.rs 2016-02-03 17:58:22 +01:00
Marek Kotewicz
619a604e84 Merge pull request #330 from ethcore/revertremoval
Revert removal of `new_code`.
2016-02-03 17:55:49 +01:00
Marek Kotewicz
9cd29b7e36 Merge pull request #329 from ethcore/nvolf
Network mod tests first part
2016-02-03 17:55:34 +01:00
debris
c9670b0032 use env package version 2016-02-03 17:35:25 +01:00
debris
6baad0e43c reveal surprise 2016-02-03 17:30:02 +01:00
Gav Wood
a0c2c6e71d dead_code, not test. 2016-02-03 17:08:33 +01:00
Gav Wood
9d3049bac0 Revert removal of new_code. 2016-02-03 17:07:12 +01:00
Nikolay Volf
e154e3e7fa fixed indents 2016-02-03 19:06:16 +03:00
Nikolay Volf
f85b9eb75b Merge branch 'master' into nvolf 2016-02-03 19:00:05 +03:00
Nikolay Volf
84e1c77938 broken sockets 2016-02-03 18:59:35 +03:00
Arkadiy Paronyan
d467ac76b0 Merge pull request #323 from ethcore/warnings
Look ma no `dead_code`
2016-02-03 16:57:08 +01:00
Arkadiy Paronyan
b831d694b4 Merge pull request #326 from ethcore/jit
Fixing JIT, Updating hook to run `ethcore` tests.
2016-02-03 16:56:59 +01:00
Arkadiy Paronyan
327a6ff79d Merge pull request #327 from ethcore/ark
Final docs
2016-02-03 16:55:46 +01:00
arkpar
3bc3d24945 Missing inline 2016-02-03 16:55:23 +01:00
arkpar
42d5c09131 Final docs 2016-02-03 16:43:48 +01:00
Nikolay Volf
834f8a07eb socket write tests 2016-02-03 18:40:54 +03:00
Tomusdrw
898e819e1a Updating git hook 2016-02-03 16:23:02 +01:00
Tomusdrw
62b7862206 Fixing evm tests for JIT 2016-02-03 16:21:52 +01:00
Nikolay Volf
df18d8104d final network tests di setup 2016-02-03 18:05:46 +03:00
Tomusdrw
83bfd43a90 Fixing JIT compilation 2016-02-03 15:59:53 +01:00
Tomusdrw
8a2db83803 Removing 2016-02-03 15:57:17 +01:00
Tomusdrw
2b4653ee35 Merge branch 'master' into warnings 2016-02-03 15:36:19 +01:00
Tomusdrw
471f1f82be Fixing unused variable warning 2016-02-03 15:35:03 +01:00
Tomusdrw
a7b1b70fc1 Changing allow(dead_code) to more specific exclusions 2016-02-03 15:33:58 +01:00
Gav Wood
fe97809649 Merge pull request #316 from ethcore/install-deps
update install-deps.sh
2016-02-03 15:31:55 +01:00
Gav Wood
9262b18e64 Merge pull request #320 from ethcore/gavdocs
Finish all my docs. Fix previous test compilation.
2016-02-03 15:31:30 +01:00
Gav Wood
a1bfcf17e3 Merge branch 'master' of github.com:ethcore/parity 2016-02-03 14:58:30 +01:00