arkpar
|
60bcab3e48
|
Merge remote-tracking branch 'origin/docker' into beta
|
2016-03-14 19:13:07 +01:00 |
|
arkpar
|
ebb7699da2
|
Merge remote-tracking branch 'origin/pv63-receipts' into beta
|
2016-03-14 18:58:23 +01:00 |
|
arkpar
|
78821bb935
|
Merge remote-tracking branch 'origin/unclesminingfix' into beta
|
2016-03-14 18:56:27 +01:00 |
|
debris
|
dfef09161c
|
update dockerfiles
|
2016-03-14 18:47:23 +01:00 |
|
debris
|
c476e7da31
|
update docker
|
2016-03-14 18:25:05 +01:00 |
|
Gav Wood
|
97051cb949
|
Add RLP, not a data item.
|
2016-03-14 18:20:24 +01:00 |
|
debris
|
81beaf1094
|
update dockerfiles
|
2016-03-14 17:53:08 +01:00 |
|
Nikolay Volf
|
8cdb013f9f
|
Merge branch 'master' into pv63-receipts
Conflicts:
ethcore/src/client/client.rs
|
2016-03-14 17:36:51 +01:00 |
|
Arkadiy Paronyan
|
683c13db37
|
Merge pull request #721 from ethcore/titi
Lock reports to avoid out of order badness.
|
2016-03-14 17:26:01 +01:00 |
|
Arkadiy Paronyan
|
d844de442a
|
Merge pull request #722 from ethcore/network
Fixed handshake leak
|
2016-03-14 16:23:54 +01:00 |
|
arkpar
|
e8a21116f7
|
missing mut
|
2016-03-14 15:50:45 +01:00 |
|
Gav Wood
|
9f81b07224
|
Lock reports to avoid out of order badness.
|
2016-03-14 15:50:32 +01:00 |
|
arkpar
|
8eeda2b1a3
|
Fixed handshake leak
|
2016-03-14 15:50:03 +01:00 |
|
Arkadiy Paronyan
|
0087568c16
|
Merge pull request #712 from ethcore/beta-version
Version 1.0 in beta
|
2016-03-14 14:56:44 +01:00 |
|
arkpar
|
4e5ebc9457
|
missing mut
|
2016-03-14 14:22:18 +01:00 |
|
arkpar
|
f6e8c03ff6
|
Merge branch 'master' of github.com:ethcore/parity into titi
|
2016-03-14 14:18:59 +01:00 |
|
arkpar
|
75a11ba9be
|
Merge remote-tracking branch 'origin/targetgaslimit' into beta
|
2016-03-14 14:05:38 +01:00 |
|
Arkadiy Paronyan
|
38de95cc3b
|
Merge pull request #719 from ethcore/targetgaslimit
Allow configuration of target gas limit.
|
2016-03-14 14:04:09 +01:00 |
|
arkpar
|
c8b65c769b
|
Fixed handshake leak
|
2016-03-14 13:54:06 +01:00 |
|
Arkadiy Paronyan
|
42499addc8
|
Merge pull request #714 from ethcore/master-version
Version 1.1 in master
|
2016-03-14 13:40:52 +01:00 |
|
Gav Wood
|
5503cd4646
|
Lock reports to avoid out of order badness.
|
2016-03-14 12:41:11 +01:00 |
|
Nikolay Volf
|
4ac9807bc1
|
fixing tests for beta
|
2016-03-14 11:12:15 +01:00 |
|
arkpar
|
1c26ffa208
|
Merge branch 'network' into beta
|
2016-03-14 11:11:36 +01:00 |
|
Gav Wood
|
44223f3658
|
Merge pull request #720 from ethcore/network
Silence UDP warnings
|
2016-03-14 11:10:12 +01:00 |
|
Nikolay Volf
|
8f4323f3bb
|
Merge branch 'master' into pv63-receipts
Conflicts:
ethcore/src/client/test_client.rs
|
2016-03-14 11:06:28 +01:00 |
|
Gav Wood
|
7320ad077f
|
Merge remote-tracking branch 'origin/master' into targetgaslimit
|
2016-03-14 10:54:38 +01:00 |
|
Nikolay Volf
|
3eb08b0d61
|
fix tests and deuncommented
|
2016-03-14 10:53:37 +01:00 |
|
Gav Wood
|
dc8b9c3205
|
Fix build.
|
2016-03-14 10:48:32 +01:00 |
|
Nikolay Volf
|
829ed4d0a6
|
commented empty slice/vec comparison
|
2016-03-14 10:47:22 +01:00 |
|
Arkadiy Paronyan
|
acd39843d4
|
Merge pull request #715 from ethcore/rpc-personal-tests
Rpc personal tests
|
2016-03-14 10:31:01 +01:00 |
|
arkpar
|
f8b18d5d7b
|
Merge remote-tracking branch 'origin/rpc-personal-tests' into beta
|
2016-03-14 10:30:22 +01:00 |
|
arkpar
|
b327e79b42
|
Merge remote-tracking branch 'origin/fixing_warnings' into beta
|
2016-03-14 10:28:38 +01:00 |
|
Arkadiy Paronyan
|
a1fe1a6136
|
Merge pull request #704 from ethcore/fixing_warnings
Fixing warnings
|
2016-03-14 10:28:28 +01:00 |
|
arkpar
|
8e2f35856a
|
Merge remote-tracking branch 'origin/docoptclean' into beta
|
2016-03-14 10:26:59 +01:00 |
|
Arkadiy Paronyan
|
d5fa49376e
|
Merge pull request #713 from ethcore/docoptclean
docopts cleanups
|
2016-03-14 10:26:38 +01:00 |
|
arkpar
|
d3c1b5455b
|
Silenced UDP warnings
|
2016-03-14 10:25:04 +01:00 |
|
arkpar
|
a029551b0b
|
Merge branch 'build' into beta
|
2016-03-14 09:56:44 +01:00 |
|
Nikolay Volf
|
8532f2dc2e
|
removed tests that used fixedhash
|
2016-03-14 09:44:02 +01:00 |
|
Nikolay Volf
|
b4ba070619
|
Merge branch 'master' into master-version
|
2016-03-14 09:40:38 +01:00 |
|
Nikolay Volf
|
6827ff9319
|
[ci skip] fix tesh.sh
|
2016-03-14 09:38:44 +01:00 |
|
Gav Wood
|
7af0a1dc2c
|
Missing comma.
|
2016-03-14 02:02:32 +01:00 |
|
Gav Wood
|
f6b7884a1d
|
Allow configuration of target gas limit.
|
2016-03-14 02:00:22 +01:00 |
|
Arkadiy Paronyan
|
c53974f125
|
Merge pull request #717 from ethcore/build
Removed rocksdb build dependency
|
2016-03-14 01:58:15 +01:00 |
|
arkpar
|
320581a3e4
|
Merge branch 'fix-discovery' into beta
|
2016-03-14 01:33:41 +01:00 |
|
Gav Wood
|
8ad66875e5
|
Merge pull request #710 from ethcore/fix-discovery
Fixed splitting Neighbours packet
|
2016-03-14 01:32:13 +01:00 |
|
arkpar
|
7bc3c0b026
|
Removed rocksdb build dependency
|
2016-03-14 01:27:27 +01:00 |
|
Nikolay Volf
|
2117d363e2
|
new account test & fix
|
2016-03-14 01:06:42 +01:00 |
|
arkpar
|
f77b4119da
|
Version 1.0
|
2016-03-14 01:01:15 +01:00 |
|
arkpar
|
9e7ff2c00e
|
Version 1.1
|
2016-03-14 01:00:17 +01:00 |
|
Gav Wood
|
e792998d0a
|
Merge remote-tracking branch 'origin/master' into fixing_warnings
|
2016-03-14 01:00:12 +01:00 |
|