grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
e54784bfeb
openethereum/parity
History
Fredrik e54784bfeb Merge branch 'master' into fo-6418-dont-export-bigint 
# Conflicts:
#	dapps/src/tests/helpers/registrar.rs
#	ethcore/evm/src/interpreter/shared_cache.rs
#	ethcore/light/src/client/header_chain.rs
#	ethcore/light/src/client/mod.rs
#	ethcore/light/src/net/mod.rs
#	ethcore/light/src/on_demand/request.rs
#	ethcore/light/src/on_demand/tests.rs
#	ethcore/light/src/provider.rs
#	ethcore/node_filter/src/lib.rs
#	ethcore/src/block.rs
#	ethcore/src/blockchain/blockchain.rs
#	ethcore/src/client/test_client.rs
#	ethcore/src/engines/authority_round/mod.rs
#	ethcore/src/engines/basic_authority.rs
#	ethcore/src/engines/mod.rs
#	ethcore/src/engines/tendermint/mod.rs
#	ethcore/src/engines/validator_set/contract.rs
#	ethcore/src/engines/validator_set/multi.rs
#	ethcore/src/engines/validator_set/safe_contract.rs
#	ethcore/src/engines/vote_collector.rs
#	ethcore/src/miner/external.rs
#	ethcore/src/miner/miner.rs
#	ethcore/src/miner/service_transaction_checker.rs
#	ethcore/src/miner/work_notify.rs
#	ethcore/src/pod_account.rs
#	ethcore/src/pod_state.rs
#	ethcore/src/snapshot/block.rs
#	ethcore/src/snapshot/consensus/work.rs
#	ethcore/src/snapshot/mod.rs
#	ethcore/src/snapshot/service.rs
#	ethcore/src/spec/spec.rs
#	ethcore/src/state/backend.rs
#	ethcore/src/trace/db.rs
#	ethcore/src/verification/queue/mod.rs
#	ethcore/src/verification/verification.rs
#	parity/informant.rs
#	rpc/src/v1/helpers/dispatch.rs
#	rpc/src/v1/helpers/light_fetch.rs
#	rpc/src/v1/helpers/signing_queue.rs
#	rpc/src/v1/impls/eth.rs
#	rpc/src/v1/impls/eth_filter.rs
#	rpc/src/v1/impls/eth_pubsub.rs
#	rpc/src/v1/impls/light/eth.rs
#	rpc/src/v1/impls/signing.rs
#	rpc/src/v1/tests/helpers/miner_service.rs
#	rpc/src/v1/tests/helpers/snapshot_service.rs
#	rpc/src/v1/tests/helpers/sync_provider.rs
#	rpc/src/v1/tests/mocked/eth.rs
#	stratum/src/lib.rs
#	sync/src/blocks.rs
#	sync/src/chain.rs
#	sync/src/light_sync/mod.rs
#	sync/src/tests/helpers.rs
#	sync/src/tests/snapshot.rs
#	updater/src/updater.rs
#	util/src/lib.rs
#	util/triehash/src/lib.rs
2017-09-04 18:32:55 +02:00
..
cli Merge pull request #6168 from paritytech/secretstore_stresstest 2017-08-16 21:20:22 +09:00
light_helpers remove re-export of parking_lot in util (#6435) 2017-09-02 20:09:13 +02:00
account.rs Use standard paths for Ethash cache (#5881) 2017-07-10 12:57:40 +02:00
blockchain.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
boot.rs Fix whitespace (#4299) 2017-01-25 18:51:41 +01:00
cache.rs Memory usage optimization (#5526) 2017-05-02 11:40:03 +02:00
configuration.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
dapps.rs Expose health status over RPC (#6274) 2017-08-28 14:11:55 +02:00
deprecated.rs Dapps and RPC server merge (#5365) 2017-04-03 10:27:37 +02:00
dir.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
helpers.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
informant.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
ipfs.rs Dapps and RPC server merge (#5365) 2017-04-03 10:27:37 +02:00
main.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
migration.rs initial light CLI 2017-03-22 18:32:04 +01:00
modules.rs Connection filter (#6359) 2017-08-29 14:38:01 +02:00
params.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
presale.rs Ledger wallet support (#4486) 2017-02-09 19:07:06 -05:00
rpc_apis.rs remove re-export of parking_lot in util (#6435) 2017-09-02 20:09:13 +02:00
rpc.rs Expose health status over RPC (#6274) 2017-08-28 14:11:55 +02:00
run.rs remove re-export of parking_lot in util (#6435) 2017-09-02 20:09:13 +02:00
secretstore.rs fixed grumbles 2017-08-09 18:17:28 +03:00
signer.rs fix #6052. honor --no-color for signer command (#6100) 2017-07-28 19:07:38 +02:00
snapshot.rs finished 2017-08-31 11:35:41 +02:00
stratum.rs remove the deprecated options in rustfmt.toml (#5616) 2017-05-19 17:12:20 +02:00
sync.rs Initial Whisper implementation (#6009) 2017-07-14 20:40:28 +02:00
upgrade.rs Fix whitespace (#4299) 2017-01-25 18:51:41 +01:00
url.rs Fix whitespace (#4299) 2017-01-25 18:51:41 +01:00
user_defaults.rs User_defaults now contains serialization for is_first_launch parameter; (#6068) 2017-07-18 15:38:38 +02:00
whisper.rs Initial Whisper implementation (#6009) 2017-07-14 20:40:28 +02:00