Merge pull request #832 from dlorenc/machine

Update docker-machine.
kubernetes · Nov 21, 2016 · dd5bd7b · dd5bd7b
2 parents 8c64068 + 7758108
commit dd5bd7b
Show file tree

Hide file tree

Showing 24 changed files with 399 additions and 223 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/vendor/github.com/docker/machine/drivers/virtualbox/network.go b/vendor/github.com/docker/machine/drivers/virtualbox/network.go
diff --git a/vendor/github.com/docker/machine/drivers/virtualbox/virtualbox.go b/vendor/github.com/docker/machine/drivers/virtualbox/virtualbox.go
diff --git a/vendor/github.com/docker/machine/drivers/virtualbox/virtualbox_freebsd.go b/vendor/github.com/docker/machine/drivers/virtualbox/virtualbox_freebsd.go
diff --git a/vendor/github.com/docker/machine/libmachine/cert/bootstrap.go b/vendor/github.com/docker/machine/libmachine/cert/bootstrap.go
diff --git a/vendor/github.com/docker/machine/libmachine/cert/cert.go b/vendor/github.com/docker/machine/libmachine/cert/cert.go