Gav Wood
|
08b9cc2c41
|
Merge changes from #674 into branch.
|
2016-03-13 15:29:55 +01:00 |
|
Tomasz Drwięga
|
03da6c991f
|
Merge branch 'master' into ethminer_crate
Conflicts:
Cargo.lock
Cargo.toml
ethcore/src/client/client.rs
hook.sh
parity/main.rs
rpc/Cargo.toml
rpc/src/v1/impls/eth.rs
sync/Cargo.toml
sync/src/tests/helpers.rs
|
2016-03-11 14:37:07 +01:00 |
|
Tomasz Drwięga
|
d84e008e00
|
Removing superflous check for nightly
|
2016-03-11 11:16:49 +01:00 |
|
Tomasz Drwięga
|
2e72173620
|
Merge branch 'master' into ethminer_crate
Conflicts:
Cargo.lock
Cargo.toml
hook.sh
miner/src/transaction_queue.rs
rpc/Cargo.toml
sync/Cargo.toml
sync/src/chain.rs
|
2016-03-10 12:25:36 +01:00 |
|
Gav Wood
|
249a89fc2d
|
Merge pull request #627 from ethcore/clippy-dev
`dev` feature enabled when compiling without `--release`
|
2016-03-10 11:05:56 +01:00 |
|
Tomasz Drwięga
|
5db84c3233
|
Adding transactions to block
|
2016-03-09 13:09:34 +01:00 |
|
Tomasz Drwięga
|
cbc2c0cf0c
|
Fixing clippy warnings. When building on nightly it is required to enable clippy
|
2016-03-07 14:34:17 +01:00 |
|
Tomasz Drwięga
|
e91de78528
|
Renaming back bad as retracted
|
2016-03-06 11:12:02 +01:00 |
|
Tomasz Drwięga
|
cc3839ae57
|
Revert "Revert "Transaction Queue integration""
This reverts commit d330f0b7b7.
Conflicts:
sync/src/transaction_queue.rs
|
2016-03-05 16:46:04 +01:00 |
|
Gav Wood
|
d330f0b7b7
|
Revert "Transaction Queue integration"
|
2016-03-05 12:53:54 +01:00 |
|
Tomasz Drwięga
|
b9a6a70ced
|
Renaming bad blocks as retracted
|
2016-03-05 11:37:19 +01:00 |
|
Gav Wood
|
b3f09596b1
|
Merge pull request #516 from ethcore/sync
Better memory management
|
2016-02-27 15:54:19 +01:00 |
|
arkpar
|
781f763f1f
|
Memory management
|
2016-02-25 14:09:39 +01:00 |
|
Tomasz Drwięga
|
990c5c8faa
|
Refactoring client and fixing mark_as_bad & SyncMessage bugs
|
2016-02-23 18:44:13 +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 |
|
arkpar
|
85c842b7fd
|
Restored service test
|
2016-02-19 13:47:13 +01: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 |
|
Gav Wood
|
4f6bff1c47
|
Kill bad test.
|
2016-02-19 11:39:36 +01:00 |
|
Nikolay Volf
|
ebe3990d0d
|
fixing tests and build
|
2016-02-11 03:40:22 +03:00 |
|
Gav Wood
|
5f742c9142
|
Fix test.
|
2016-02-11 00:38:19 +01:00 |
|
Gav Wood
|
9ac4f51601
|
Allow path to be configured.
|
2016-02-10 21:17:47 +01:00 |
|
Tomusdrw
|
96dda7b73a
|
Forwarding panics from threads
|
2016-02-10 16:35:52 +01:00 |
|
arkpar
|
499637606d
|
DB directory versioning
|
2016-02-05 15:08:18 +01:00 |
|
debris
|
c90d64662a
|
added license in every *.rs file
|
2016-02-05 13:40:41 +01:00 |
|
arkpar
|
42d5c09131
|
Final docs
|
2016-02-03 16:43:48 +01:00 |
|
debris
|
30dc9d857d
|
cleanup ethcore public interfaces
|
2016-02-02 15:29:53 +01:00 |
|
Nikolay Volf
|
5837b6e131
|
Merge branch 'master' into coverage-effort
Conflicts:
ethcore/res/ethereum/tests
|
2016-01-31 18:40:59 +04:00 |
|
debris
|
8fe0d74b64
|
moved src to ethcore
|
2016-01-31 10:36:48 +01:00 |
|