From dd547af0c432d080b41654b33081dcdde5c2794f Mon Sep 17 00:00:00 2001 From: rhapsodhy Date: Sun, 30 Nov 2014 04:15:44 +0000 Subject: [PATCH 1/2] fix googlecompute oauth dependency --- builder/googlecompute/driver_gce.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/googlecompute/driver_gce.go b/builder/googlecompute/driver_gce.go index e48b50dc1..835add5d9 100644 --- a/builder/googlecompute/driver_gce.go +++ b/builder/googlecompute/driver_gce.go @@ -7,8 +7,8 @@ import ( "time" "code.google.com/p/google-api-go-client/compute/v1" - "github.com/golang/oauth2" - "github.com/golang/oauth2/google" + "golang.org/x/oauth2" + "golang.org/x/oauth2/google" "github.com/mitchellh/packer/packer" ) From 582b8a6ad9447aed2a1a13c9dffdfdad053701f4 Mon Sep 17 00:00:00 2001 From: dragon788 Date: Fri, 5 Dec 2014 10:55:27 -0600 Subject: [PATCH 2/2] Fixed typo --- website/source/docs/builders/vmware-iso.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/builders/vmware-iso.html.markdown b/website/source/docs/builders/vmware-iso.html.markdown index 61ef31cf7..d909aac0f 100644 --- a/website/source/docs/builders/vmware-iso.html.markdown +++ b/website/source/docs/builders/vmware-iso.html.markdown @@ -228,7 +228,7 @@ each category, the available options are alphabetized and described. `tools_upload_flavor`. By default the upload path is set to `{{.Flavor}}.iso`. -* `version` (string) - The [vmx hardware version](http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1003746) for the new virtual machine. Only the default value has been tested, any other value is expiermental. Default value is '9'. +* `version` (string) - The [vmx hardware version](http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1003746) for the new virtual machine. Only the default value has been tested, any other value is experimental. Default value is '9'. * `vm_name` (string) - This is the name of the VMX file for the new virtual machine, without the file extension. By default this is "packer-BUILDNAME",