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

..

api

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

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

dev

cmd/swarm: Exit if --ethapi is set

2017-06-30 10:16:03 +01:00

fuse

build: enable unconvert linter (#15456)

2017-11-10 19:06:45 +02:00

network

cmd/swarm: add config file (#15548)

2017-12-11 22:56:06 +01:00

services/swap

cmd/swarm: add config file (#15548)

2017-12-11 22:56:06 +01:00

storage

cmd/swarm: add config file (#15548)

2017-12-11 22:56:06 +01:00

testutil

all: update license information

2017-04-14 10:29:00 +02:00

swarm_test.go

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

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

swarm.go

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

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