Commit Graph

6 Commits

Author SHA1 Message Date
amalraj.manigmail.com 4dbd95947d Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18
# Conflicts:
#	.github/CONTRIBUTING.md
#	.travis.yml
#	core/blockchain.go
#	core/vm/evm.go
#	core/vm/logger_test.go
#	eth/handler_test.go
#	eth/tracers/tracer_test.go
#	internal/ethapi/api.go
#	internal/web3ext/web3ext.go
#	p2p/discover/node.go
#	p2p/server.go
#	swarm/network/simulations/discovery/discovery_test.go
2019-01-29 19:08:50 +08:00
Vinod Damle 2f14958559 p2p: remove spurious log for denied node permissioning
connection is only denied after cycling through entire list, remove
confusing and erroneous log in the loop
2018-10-17 11:53:13 -04:00
Patrick Mylund Nielsen 8eb454750a p2p/permissions: Fix typos 2017-11-14 16:43:43 -05:00
Joel Burget cdee0dafe3 Tweak permissioned node logging. 2017-11-14 16:24:53 -05:00
Patrick Mylund Nielsen 3d91976f08
Geth 1.7.2 rebase and addition of Istanbul BFT (#207) 2017-10-31 18:24:11 -04:00
Sudhir Upadhyay 5806b453a9 implemented node permissioning 2016-11-17 18:50:28 -05:00