Commit graph

6 commits

Author SHA1 Message Date
Christopher Franko
a85150f0b4 upstream merge continued 2017-03-26 12:08:39 -04:00
Christopher Franko
5822644626 Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.5.9 2017-03-26 11:40:56 -04:00
Jamie Pitts
dbd88a1aa4 params: updated bootnodes (#3720)
* Updated the list of go bootnodes: replaced BR with a new one, added US-WEST and AU.

* Updated bootnodes, minor go formatting change.
2017-02-28 12:30:44 +02:00
Christopher Franko
57638f70e6 Merge https://github.com/ethereum/go-ethereum into rebase-1.5.9 2017-02-15 13:21:31 -05:00
Felix Lange
b9683d3748 params: avoid importing p2p/discover for bootnodes
params is imported by leaf-ish library packages and should not pull in
the p2p stack.
2017-01-06 14:15:21 +01:00
Péter Szilágyi
dfe79cc784
cmd/utils, mobile: place bootnodes in LGPL packages 2016-11-14 18:00:14 +02:00
Renamed from cmd/utils/bootnodes.go (Browse further)