go-ethereum

Commit Graph

Author	SHA1	Message	Date
ethersphere	e187711c65	swarm: network rewrite merge	2018-06-21 21:10:31 +02:00
Janos Guljas	19982f9467	swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints Merge with changes that implement config file PR #15548. Field EnsApi string in swarm/api.Config is replaced with EnsAPIs []string. A new field EnsDisabled bool is added to swarm/api.Config for easy way to disable ENS resolving with config file. Signature of function swarm.NewSwarm is changed and simplified.	2017-12-13 10:40:39 +01:00

Author

SHA1

Message

Date

ethersphere

e187711c65

swarm: network rewrite merge

2018-06-21 21:10:31 +02:00

Janos Guljas

19982f9467

swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints

Merge with changes that implement config file PR #15548.

Field *EnsApi string* in swarm/api.Config is replaced with
*EnsAPIs []string*.

A new field *EnsDisabled bool* is added to swarm/api.Config for
easy way to disable ENS resolving with config file.

Signature of function swarm.NewSwarm is changed and simplified.

2017-12-13 10:40:39 +01:00

2 Commits