docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generic: update to new logging; fix ssh user bug 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-04-30 17:05:59 -04:00
parent 8e0b80b015
commit 2d525d0abd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/generic/generic.go
View File

@ -6,9 +6,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
log "github.com/Sirupsen/logrus"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/docker/machine/drivers" "github.com/docker/machine/drivers"
"github.com/docker/machine/log"
"github.com/docker/machine/provider" "github.com/docker/machine/provider"
"github.com/docker/machine/state" "github.com/docker/machine/state"
"github.com/docker/machine/utils" "github.com/docker/machine/utils"
@ -113,7 +113,7 @@ func (d *Driver) GetProviderType() provider.ProviderType {
func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.IPAddress = flags.String("generic-ip-address") d.IPAddress = flags.String("generic-ip-address")
d.SSHUser = flags.String("generic-user") d.SSHUser = flags.String("generic-ssh-user")
d.SSHKey = flags.String("generic-ssh-key") d.SSHKey = flags.String("generic-ssh-key")
d.SSHPort = flags.Int("generic-ssh-port") d.SSHPort = flags.Int("generic-ssh-port")