Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints | Janos Guljas | 2017-12-13 | 1 | -0/+119 |
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. |