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

2018-02-09 12:23:30 +01:00
parent 820cf09c98 1a4e68721a
commit a3a07350dc
487 changed files with 178047 additions and 8088 deletions
--- a/cmd/swarm/config.go
+++ b/cmd/swarm/config.go
@ -361,7 +361,7 @@ func validateEnsAPIs(s string) (err error) {
 func printConfig(config *bzzapi.Config) string {
 	out, err := tomlSettings.Marshal(&config)
 	if err != nil {
-		return (fmt.Sprintf("Something is not right with the configuration: %v", err))
+		return fmt.Sprintf("Something is not right with the configuration: %v", err)
 	}
 	return string(out)
 }