aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update JSON test filesGustav Simonsson2015-05-0749-4914/+9977
* updated ignoreobscuren2015-05-071-0/+1
* Merge pull request #867 from Gustav-Simonsson/fix_block_tests_genesis_block_t...Jeffrey Wilcke2015-05-073-4/+1
|\
| * Unskip now working tests, remove debug printGustav Simonsson2015-05-072-4/+0
| * Add genesis block total difficulty in testsGustav Simonsson2015-05-071-0/+1
* | Merge pull request #866 from fjl/p2p-last-minuteJeffrey Wilcke2015-05-076-26/+24
|\ \
| * | p2p: stop dialing at half the maximum peer countFelix Lange2015-05-071-1/+1
| * | p2p, whisper: use glog for peer-level loggingFelix Lange2015-05-073-20/+16
| * | p2p/discover: bump packet timeouts to 500msFelix Lange2015-05-071-2/+2
| * | p2p/nat: less confusing error loggingFelix Lange2015-05-071-3/+5
* | | cmd/geth: gofmt screwup fixobscuren2015-05-071-0/+2
* | | cmd/geth: version bumpobscuren2015-05-071-3/+1
* | | Merge branch 'karalabe-cherry-trusted-peers' into developobscuren2015-05-077-39/+317
|\ \ \ | |/ / |/| |
| * | fixed merge issueobscuren2015-05-077-39/+317
|/| |
| * | eth, p2p: add trusted node list beside static listPéter Szilágyi2015-05-045-51/+59
| * | cmd/mist: fix a stale error messagePéter Szilágyi2015-05-041-1/+1
| * | p2p: add static node dialing testPéter Szilágyi2015-05-042-13/+108
| * | p2p: correct a leftover trusted -> staticPéter Szilágyi2015-05-011-4/+4
| * | eth, p2p: rename trusted nodes to static, drop inbound extra slotsPéter Szilágyi2015-05-015-57/+59
| * | cmd, eth, p2p: fix review issues enumerated by FelixPéter Szilágyi2015-04-308-34/+25
| * | p2p: add trust check to handshake, test privileged connectivityPéter Szilágyi2015-04-304-15/+88
| * | p2p: reduce the severity of a debug logPéter Szilágyi2015-04-301-1/+1
| * | cmd/geth, cmd/utils, eth: internalize trusted node config filePéter Szilágyi2015-04-303-30/+20
| * | cmd/geth, cmd/mist, cmd/utils, eth, p2p: support trusted peersPéter Szilágyi2015-04-308-27/+146
* | | Merge pull request #791 from fjl/discover-sha3-distanceJeffrey Wilcke2015-05-0714-292/+651
|\ \ \ | |_|/ |/| |
| * | p2p/discover: new distance metric based on sha3(id)Felix Lange2015-05-066-106/+354
| * | common: add Hash.GenerateFelix Lange2015-04-301-1/+14
| * | p2p/discover: track sha3(ID) in NodeFelix Lange2015-04-308-99/+166
| * | p2p, p2p/discover: protocol version 4Felix Lange2015-04-302-2/+2
| * | p2p/discover: new endpoint formatFelix Lange2015-04-3011-129/+160
| |/
* | Merge pull request #861 from obscuren/transaction_pool_fixesJeffrey Wilcke2015-05-078-7/+133
|\ \
| * | cmd/geth: limit `pendingTransactions` to owned accounts.obscuren2015-05-071-33/+53
| * | cmd/mist: updated xeth transactobscuren2015-05-072-1/+2
| * | cmd/geth: admin, switched price with limit in argumentsobscuren2015-05-071-2/+2
| * | cmd/geth: implemented resending transaction with different gas settingsobscuren2015-05-071-0/+83
| * | core: use removeTx instead of deleteobscuren2015-05-071-1/+1
| * | xeth, rpc: added nonce setting through RPC and xeth transactobscuren2015-05-074-5/+27
* | | Merge pull request #859 from Gustav-Simonsson/ethash_reloadedJeffrey Wilcke2015-05-0749-2394/+3419
|\ \ \ | |/ / |/| |
| * | Add ethash linux & windows build fixesGustav Simonsson2015-05-065-10/+11
| * | Unskip working blocktests following ethash cache reusageGustav Simonsson2015-05-051-10/+4
| * | Integrate new ethash API and change geth makedag cmdGustav Simonsson2015-05-059-27/+41
| * | Update ethash Godeps filesGustav Simonsson2015-05-0539-2353/+3369
* | | Merge pull request #771 from zsfelfoldi/developJeffrey Wilcke2015-05-064-35/+299
|\ \ \ | |/ / |/| |
| * | setTimeout and sendAsync implementedzsfelfoldi2015-05-064-35/+299
|/ /
* | Merge pull request #856 from karalabe/windows-console-color-fixJeffrey Wilcke2015-05-0510-2/+763
|\ \
| * | cmd/geth: fix #853 colorize console output in windowsPéter Szilágyi2015-05-0510-2/+763
|/ /
* | Merge pull request #835 from obscuren/handler_errorsJeffrey Wilcke2015-05-049-318/+547
|\ \ | |/ |/|
| * core: added unix timestamp to debug output for block procobscuren2015-05-041-1/+1
| * downloader: hash downloading recoveryobscuren2015-05-032-29/+71
| * cmd/geth, eth: bump version & tmp fix for incorrect TD peersobscuren2015-05-032-1/+8
| * eth/downloader: put back hashes on block overflow errorobscuren2015-05-031-19/+14
| * eth/downloader: changed has to blockHashes for chain linkingobscuren2015-05-031-1/+1
| * core: print ignored blocksobscuren2015-05-031-1/+1
| * eth/downloader: added additional testsobscuren2015-05-032-4/+73
| * eth,core: changed NewTicker to Tickobscuren2015-05-032-6/+6
| * core: added 'ignored' statusobscuren2015-05-011-2/+3
| * eth, eth/downloader: Moved block processing & graceful shutdownobscuren2015-05-016-291/+347
| * eth/downloader: delete blocks from queueobscuren2015-04-302-3/+15
| * core: added a wait group to chain manager for graceful shutdownobscuren2015-04-302-0/+9
| * core: check for parent in calc TD. TD = (N != 0 == parent.TD) || (== D)obscuren2015-04-301-0/+4
| * core, eth: verify td of received blocksobscuren2015-04-302-3/+25
| * eth, eth/downloader: remove bad peers from peer setobscuren2015-04-302-17/+29
|/
* Merge pull request #830 from obscuren/downloader-missing-parentJeffrey Wilcke2015-04-3015-33/+117
|\
| * cmd/geth: bump version to 0.9.14obscuren2015-04-301-1/+1
| * core: remove txs from queue in addition to removal of pendingobscuren2015-04-302-1/+49
| * core: added some additional chain tests for shortest chainobscuren2015-04-302-5/+30
| * eth: rely on p2p to determine block propagationobscuren2015-04-301-1/+1
| * p2p: added received at to peer messageobscuren2015-04-302-3/+5
| * core/types, eth: meassure and display propagation timesobscuren2015-04-302-1/+5
| * eth/downloader: drop blockobscuren2015-04-301-1/+1
| * core: fixed tetst to reflect (int, error) return by insertChainobscuren2015-04-292-4/+4
| * eth/downloader: ignore orphan blocks in the downloader.obscuren2015-04-291-5/+9
| * core: return the index of the block that failed when inserting a chainobscuren2015-04-297-14/+15
|/
* Merge pull request #825 from obscuren/developJeffrey Wilcke2015-04-296-35/+117
|\
| * eth/downloader: reset the chain when parent is missing during processingobscuren2015-04-291-0/+2
| * cmd/geth: bump version numberobscuren2015-04-291-1/+1
| * core: fixed chain reorg during splitsobscuren2015-04-292-27/+83
| * core/types: added fake parent hash / hash to String() outputobscuren2015-04-291-1/+11
| * eth: check if downloader is busy before showing log messageobscuren2015-04-292-0/+9
| * core: seperated proccing mutex and getting mutexobscuren2015-04-292-42/+48
| * core: bump database versionobscuren2015-04-291-1/+1
| * core: moved mutex locks in insert blocks to start of functionobscuren2015-04-291-41/+40
| * core: set min gas price at startupobscuren2015-04-291-10/+10
* | Merge pull request #822 from fjl/makefile-improvementsJeffrey Wilcke2015-04-2910-98/+121
|\ \ | |/ |/|
| * Use Makefile for Travis testsFelix Lange2015-04-295-36/+37
| * Makefile: add test targetFelix Lange2015-04-291-4/+7
| * cmd/mist: always enable whisperFelix Lange2015-04-291-0/+1
| * cmd/geth, cmd/mist: use gitCommit in node nameFelix Lange2015-04-292-15/+36
| * Makefile: set main.gitCommit when buildingFelix Lange2015-04-292-2/+15
| * cmd/mist: add blockchain version flagFelix Lange2015-04-291-0/+1
| * README: simplify build instructionsFelix Lange2015-04-291-40/+19
| * Makefile: clean should also delete Godeps/_workspace/pkgFelix Lange2015-04-291-1/+1
| * build: run build commands from the fake workspace rootFelix Lange2015-04-291-1/+5
* | Merge pull request #828 from tgerring/pathfixesJeffrey Wilcke2015-04-291-6/+7
|\ \ | |/ |/|
| * Remove path separator literalsTaylor Gerring2015-04-291-6/+7
|/
* Merge pull request #821 from karalabe/nodedb-fixJeffrey Wilcke2015-04-281-4/+6
|\
| * p2p/discover: fix api issues caused by leveldb updatePéter Szilágyi2015-04-281-4/+6
* | Merge pull request #820 from fjl/rlp-readkind-overflowJeffrey Wilcke2015-04-282-14/+40
|\ \ | |/ |/|
| * rlp: fix list bounds check overflow (found by go-fuzz)Felix Lange2015-04-282-14/+40
* | Merge pull request #793 from karalabe/discovery-node-cacheJeffrey Wilcke2015-04-2810-47/+691
|\ \
| * | p2p/discover: fix goroutine leak due to blocking on sync.OncePéter Szilágyi2015-04-282-13/+24
| * | p2p/discover: add node expirer and related testsPéter Szilágyi2015-04-273-4/+116
| * | p2p/discover: parametrize nodedb version, add persistency testsPéter Szilágyi2015-04-273-11/+62
| * | p2p/discover: drop a superfluous warningPéter Szilágyi2015-04-271-1/+1
| * | p2p/discover: wrap the pinger to update the node db tooPéter Szilágyi2015-04-271-4/+15
| * | p2p/discover: use iterator based seeding, drop old protocol testPéter Szilágyi2015-04-272-45/+118
| * | p2p/discover: write the basic tests, catch RLP bugPéter Szilágyi2015-04-273-8/+150
| * | p2p/discovery: fix issues raised in the nodeDb PRPéter Szilágyi2015-04-272-36/+32
| * | cmd/bootnode, eth, p2p, p2p/discover: use a fancier db designPéter Szilágyi2015-04-249-169/+280
| * | cmd/bootnode, eth, p2p, p2p/discover: clean up the seeder and mesh into eth.Péter Szilágyi2015-04-249-144/+168
| * | p2p/discovery: fix broken tests due to API updatePéter Szilágyi2015-04-242-4/+4
| * | p2p/discovery: use the seed table for finding nodes, auto drop stale onesPéter Szilágyi2015-04-242-5/+38
| * | cmd, eth, p2p, p2p/discover: init and clean up the seed cachePéter Szilágyi2015-04-246-9/+29
| * | p2p/discover: store nodes in leveldbFelix Lange2015-04-242-13/+73
| |/
* | Merge pull request #819 from karalabe/leveldb-updateJeffrey Wilcke2015-04-28155-10106/+7571
|\ \
| * | godeps: update leveldb and snappy, dump serpent-goPéter Szilágyi2015-04-28155-10106/+7571
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-04-2820-216/+1024
|\ \ \
| * \ \ Merge pull request #738 from karalabe/whisper-cleanupJeffrey Wilcke2015-04-2820-216/+1024
| |\ \ \ | | |/ / | |/| |
| | * | rpc, xeth: finish cleaning up xethPéter Szilágyi2015-04-282-17/+36
| | * | whisper: add full filter test suitePéter Szilágyi2015-04-282-2/+51
| | * | whisper: fix a small data race duirng peer connectionPéter Szilágyi2015-04-282-14/+12
| | * | xeth: fix un-decoded whisper RPC topic string bugPéter Szilágyi2015-04-281-2/+16
| | * | rpc: use nil topic wildcards instead of ""Péter Szilágyi2015-04-281-1/+1
| | * | ui/qt/qwhisper, whisper, xeth: polish topic filter, fix wildcardsPéter Szilágyi2015-04-287-45/+215
| | * | rpc, ui/qt/qwhisper, whisper, xeth: introduce complex topic filtersPéter Szilágyi2015-04-2811-59/+373
| | * | whisper: fix spurious From identity with untargeted messagesPéter Szilágyi2015-04-281-1/+3
| | * | whisper: fix payload loss in case of plaintext decryptPéter Szilágyi2015-04-282-4/+109
| | * | whisper, xeth/whisper: surface TTL and hash to the APIPéter Szilágyi2015-04-285-6/+25
| | * | eth: pull in a lost merge changePéter Szilágyi2015-04-281-2/+4
| | * | rpc, whisper, xeth: fix RPC message retrieval data racePéter Szilágyi2015-04-286-13/+119
| | * | whisper: fix send timestamp omission during envelope openingPéter Szilágyi2015-04-281-0/+1
| | * | rpc, whisper, xeth: polish whisper RPC interfacePéter Szilágyi2015-04-286-120/+129
| |/ /
* | | Merge branch 'kobigurk-develop' into developobscuren2015-04-282-0/+6
|\ \ \ | |/ / |/| |
| * | eth, rpc, xeth: ext_hanhrate => eth_hashrateobscuren2015-04-283-3/+2
| * | Merge branch 'develop' of https://github.com/kobigurk/go-ethereum into kobigu...obscuren2015-04-283-0/+7
|/| |
| * | move eth_hashrate to extKobi Gurkan2015-04-211-2/+2
| * | uses newHexNum for eth_hashrateKobi Gurkan2015-04-211-1/+1
| * | adds eth_hashrate RPC methodKobi Gurkan2015-04-213-0/+7
* | | Merge pull request #817 from tgerring/rpcglogJeffrey Wilcke2015-04-283-7/+6
|\ \ \
| * | | Return Gas Price not GasTaylor Gerring2015-04-281-2/+2
| * | | Add link to Windows 64-bit geth dev buildTaylor Gerring2015-04-271-1/+1
| * | | Remove old logger from RPC pkgTaylor Gerring2015-04-272-4/+3
* | | | Merge pull request #818 from Gustav-Simonsson/add_privkey_loading_to_block_testsJeffrey Wilcke2015-04-2824-356/+2779
|\ \ \ \ | |/ / / |/| | |
| * | | Add loading of block test privkey if presentGustav Simonsson2015-04-284-9/+35
| * | | Update JSON testsGustav Simonsson2015-04-2820-347/+2744
|/ / /
* | | Merge pull request #813 from obscuren/general_fixesJeffrey Wilcke2015-04-268-24/+22
|\ \ \
| * | | geth/main: removed crazy welcome message :-(obscuren2015-04-261-1/+2
| * | | web3: updatedobscuren2015-04-262-2/+2
| * | | core, miner: added value check on tx validationobscuren2015-04-265-21/+18
|/ / /
* | | Merge pull request #805 from obscuren/download_improvementsJeffrey Wilcke2015-04-2517-232/+198
|\ \ \
| * | | cmd/geth: bump version number 0.9.12obscuren2015-04-251-1/+1
| * | | eth/downloader: removed update loop and synch channelobscuren2015-04-251-25/+0
| * | | xeth, core, cmd/utils: Transaction can not be over block gas limitobscuren2015-04-248-18/+37
| * | | natspec: disabled natspec testobscuren2015-04-241-0/+1
| * | | eth: added a few informative messages regarding downloadingobscuren2015-04-241-0/+6
| * | | eth/downloader: fixed testsobscuren2015-04-241-12/+8
| * | | eth, eth/downloader: simplified synchronisation processobscuren2015-04-242-31/+24
| * | | eth/downloader: removed peer td management and best peer selectionobscuren2015-04-242-16/+2
| * | | eth, eth/downloader: don't require td on downloader. Fixed testsobscuren2015-04-244-25/+22
| * | | eth, eth/downloader: moved peer selection to protocol handlerobscuren2015-04-244-134/+127
* | | | Merge pull request #796 from Gustav-Simonsson/fix_ignoring_of_unexpected_file...Jeffrey Wilcke2015-04-251-3/+2
|\ \ \ \
| * | | | Remove unneeded allocationGustav Simonsson2015-04-251-1/+0
| * | | | Use make instead of new for allocationGustav Simonsson2015-04-241-1/+1
| * | | | Fix ignore of unexpected files in key dirGustav Simonsson2015-04-231-3/+3
* | | | | Merge pull request #803 from obscuren/log_filter_fixesJeffrey Wilcke2015-04-241-5/+14
|\ \ \ \ \
| * | | | | core: fixed wildcard topic filters. Closes #725obscuren2015-04-241-5/+14
* | | | | | Merge pull request #773 from ethersphere/frontier/cliJeffrey Wilcke2015-04-246-55/+66
|\ \ \ \ \ \
| * | | | | | cli: correct bootnodes flag usage help linezelig2015-04-241-1/+1
| * | | | | | cli/js console: if corsDomain is not given to startRpc, we fall back to value...zelig2015-04-244-11/+14
| * | | | | | cli: fatal error if no etherbase for miningzelig2015-04-241-1/+3
| * | | | | | backend: start miner in its go routine (no wait to generate DAG)zelig2015-04-241-2/+1
| * | | | | | cli: fatal error if rpc could not be startedzelig2015-04-242-3/+5
| * | | | | | cli: clean up flag descriptions, usage docs, account list uses primary and in...zelig2015-04-243-29/+25
| * | | | | | js console: add cors domain optional argument to startRpczelig2015-04-242-8/+17
| * | | | | | cmd/admin: rename debug.block to debug.processBlock; move backtrace under debugzelig2015-04-241-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #804 from alexvandesande/avsa-gethJeffrey Wilcke2015-04-241-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'avsa-geth' of https://github.com/alexvandesande/go-ethereum int...Alexandre Van de Sande2015-04-240-0/+0
| |\ \ \ \ \
| | * | | | | Smaller frontier cover artAlexandre Van de Sande2015-04-241-1/+1
| | | |_|_|/ | | |/| | |
| * / | | | Smaller frontier cover artAlexandre Van de Sande2015-04-241-1/+1
|/ / / / /
* | / / / Update README.mdJeffrey Wilcke2015-04-241-0/+1
| |/ / / |/| | |
* | | | Merge pull request #800 from obscuren/ethereum_js_updateJeffrey Wilcke2015-04-247-12/+7
|\ \ \ \ | |/ / / |/| | |
| * | | web3: updatedobscuren2015-04-243-4/+1
| * | | cmd/geth, jsre: updated ethereum.js => web3.jsobscuren2015-04-243-3/+5
| * | | eth: cleanupobscuren2015-04-241-5/+1
|/ / /
* | | Merge pull request #797 from tgerring/bootnodesJeffrey Wilcke2015-04-242-7/+4
|\ \ \
| * | | Updated bootnodesTaylor Gerring2015-04-241-2/+3
| * | | Cleanup README developer infoTaylor Gerring2015-04-241-5/+1
| |/ /
* | | Merge pull request #778 from bas-vk/issue764Jeffrey Wilcke2015-04-245-48/+62
|\ \ \
| * \ \ Merge branch 'issue764' of https://github.com/bas-vk/go-ethereum into issue764Bas van Kervel2015-04-240-0/+0
| |\ \ \
| | * | | bugfix, wrong hash stored in blockDbBas van Kervel2015-04-231-1/+1
| | * | | change order of block insert and update LastBlockBas van Kervel2015-04-221-4/+4
| | * | | Moved leveldb update loop to eth/backendBas van Kervel2015-04-224-42/+56
| | | |/ | | |/|
| * | | Moved leveldb update loop to eth/backendBas van Kervel2015-04-235-48/+62
| | |/ | |/|
* | | Merge pull request #794 from Gustav-Simonsson/block_tests_more_validationsJeffrey Wilcke2015-04-241-0/+82
|\ \ \ | |/ / |/| |
| * | Add block header validations for block testsGustav Simonsson2015-04-231-0/+82
|/ /
* | Merge pull request #792 from veox/doc-crypto-secp256k1Jeffrey Wilcke2015-04-231-1/+4
|\ \
| * | doc: crypto/secp256k1 GMP dependency package name.Noel Maersk2015-04-231-1/+4
|/ /
* | Merge pull request #769 from obscuren/developJeffrey Wilcke2015-04-2312-66/+261
|\ \
| * | core: pending txs now re-validated once every secondobscuren2015-04-231-3/+27
| * | miner: show error message for gas limit per accountobscuren2015-04-231-2/+2
| * | natspec: fixed test to work with new queued transactionsobscuren2015-04-231-1/+1
| * | core: added accessor for queued transactionsobscuren2015-04-231-0/+12
| * | eth: moved mined, tx events to protocol-hnd and improved tx propagationobscuren2015-04-234-30/+82
| * | core: fixed testobscuren2015-04-231-1/+3
| * | core: set the state for the managed tx stateobscuren2015-04-231-1/+1
| * | core: improved error message for invalid nonce txsobscuren2015-04-231-1/+1
| * | core: only post event once per tx & fixed testobscuren2015-04-232-15/+21
| * | xeth, miner: updated some loggingobscuren2015-04-232-3/+4
| * | eth: start tx pool in a goroutineobscuren2015-04-231-1/+1
| * | core: implemented a queued approach processing transactionsobscuren2015-04-233-25/+123
|/ /
* | Merge pull request #779 from Gustav-Simonsson/block_tests_reloadedJeffrey Wilcke2015-04-2333-6328/+5653
|\ \
| * | Include ZeroByteAtTheEnd and RandomByteAtTheEnd testsGustav Simonsson2015-04-231-8/+1
| * | Validate block header UncleHash against calculated hashGustav Simonsson2015-04-232-2/+13
| * | Unskip BlockTests/bcInvalidHeaderTest.json wrongUncleHashGustav Simonsson2015-04-231-4/+1
| * | Finally, glorious HEXGustav Simonsson2015-04-231-4/+4
| * | Add StateTests/stMemoryStressTest.json but skip for nowGustav Simonsson2015-04-231-0/+6
| * | Exclude TransactionWithSvalue0 as it expects invalid s value to be validGustav Simonsson2015-04-231-0/+1
| * | Update github.com/ethereum/tests filesGustav Simonsson2015-04-2326-6304/+5619
| * | Explicitly skip TransactionTests/tt10mbDataField.jsonGustav Simonsson2015-04-232-6/+3
| * | Add test wrapper for VMTests/vmInputLimits1.jsonGustav Simonsson2015-04-231-0/+5
|/ /
* | Merge pull request #780 from maran/arm_buildJeffrey Wilcke2015-04-231-0/+2
|\ \
| * | Adding flags to facilitate cross compiling to ARMMaran2015-04-221-0/+2
* | | Merge pull request #786 from tgerring/issue739Jeffrey Wilcke2015-04-231-1/+5
|\ \ \
| * | | Handle bug in parent call responseTaylor Gerring2015-04-231-1/+5
* | | | Merge pull request #782 from alexvandesande/developJeffrey Wilcke2015-04-231-1/+1
|\ \ \ \
| * | | | Changed "Welcome to the Frontier" to something more geekyAlexandre Van de Sande2015-04-231-1/+1
| | |/ / | |/| |
* | | | Merge pull request #783 from tgerring/issue777Jeffrey Wilcke2015-04-232-11/+61
|\ \ \ \
| * | | | Tests for magic wordsTaylor Gerring2015-04-231-0/+35
| * | | | Accept num or hex as indexTaylor Gerring2015-04-232-5/+5
| * | | | Update eth_getBlockByNumber to accept wordsTaylor Gerring2015-04-232-6/+21
| | |/ / | |/| |
* | | | Merge pull request #784 from tgerring/issue737Jeffrey Wilcke2015-04-231-1/+1
|\ \ \ \
| * | | | Rename eth_Version to eth_protocolVersion. Closes #737Taylor Gerring2015-04-231-1/+1
| |/ / /
* | | | Merge pull request #787 from ethereum/revert-785-revert-781-developFelix Lange2015-04-233-39/+54
|\ \ \ \
| * | | | Revert "Revert "refactor Dockerfile""Felix Lange2015-04-233-39/+54
|/ / / /
* | | | Merge pull request #785 from ethereum/revert-781-developFelix Lange2015-04-233-54/+39
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "refactor Dockerfile"Felix Lange2015-04-233-54/+39
|/ / /
* | | Merge pull request #781 from caktux/developcaktux2015-04-233-39/+54
|\ \ \ | |/ / |/| |
| * | refactor Dockerfilecaktux2015-04-223-39/+54
|/ /
* | Merge pull request #776 from fjl/win32-build-fixesJeffrey Wilcke2015-04-226-246/+89
|\ \
| * | cmd/geth: improve the JS testsFelix Lange2015-04-222-209/+71
| * | p2p: return zero node from Self if the server is not runningFelix Lange2015-04-221-1/+6
| * | miner: use 32bit atomic operationsFelix Lange2015-04-221-11/+12
| * | common: delete BinaryLengthFelix Lange2015-04-222-25/+0
|/ /
* | Merge pull request #765 from Gustav-Simonsson/more_block_test_improvementsFelix Lange2015-04-224-130/+185
|\ \
| * | Further fixes to block test wrapperGustav Simonsson2015-04-214-130/+185
* | | Merge pull request #766 from tgerring/issue762Jeffrey Wilcke2015-04-221-41/+46
|\ \ \ | |_|/ |/| |
| * | Treat hexnums as big.Int instead of int64Taylor Gerring2015-04-211-41/+46
|/ /
* | Updated README to include windows buildsJeffrey Wilcke2015-04-211-2/+2
* | Merge pull request #760 from obscuren/developJeffrey Wilcke2015-04-2120-4053/+45
|\ \
| * \ Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-04-217-115/+294
| |\ \ | |/ / |/| |