Merge pull request #36 from QuentinPerez/patch-4

moul · moul · commit 98c6c3198821 · 2016-04-28T18:16:44.000+02:00
netstat loop
diff --git a/README.md b/README.md
@@ -146,6 +146,8 @@ $ curl --silent http://212.47.248.251 | head -n1 # you can also open your browse
 
 ### master (unreleased)
 
+* Fix provisionning error with xenial
+* `docker-machine ls` displays the commercial-type
 * Switch default image to **Ubuntu Xenial**
 * Add `--scaleway-image` ([#22](https://github.com/scaleway/docker-machine-driver-scaleway/issues/22))
 * Add `--scaleway-debug`
diff --git a/driver/scaleway.go b/driver/scaleway.go
@@ -50,7 +50,7 @@ func (d *Driver) DriverName() string {
 	if d.CommercialType == "" {
 		return "scaleway"
 	}
-	return fmt.Sprintf("scaleway (%v)", d.CommercialType)
+	return fmt.Sprintf("scaleway(%v)", d.CommercialType)
 }
 
 func (d *Driver) getClient() (cl *api.ScalewayAPI, err error) {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func (d *Driver) DriverName() string {`
`50`	`50`	`if d.CommercialType == "" {`
`51`	`51`	`return "scaleway"`
`52`	`52`	`}`
`53`		`- return fmt.Sprintf("scaleway (%v)", d.CommercialType)`
	`53`	`+ return fmt.Sprintf("scaleway(%v)", d.CommercialType)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func (d Driver) getClient() (cl api.ScalewayAPI, err error) {`