From e4fa9ea7edab5aaefd72ec03ea4aabcf3bd78275 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Wed, 19 Aug 2015 16:10:17 -0700
Subject: [PATCH 1/3] update godeps

---
 Godeps/Godeps.json                                        | 8 ++++----
 .../cloud}/compute/metadata/metadata.go                   | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename Godeps/_workspace/src/{github.com/GoogleCloudPlatform/gcloud-golang => google.golang.org/cloud}/compute/metadata/metadata.go (100%)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index bfa1ea73..a04bddc7 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -20,10 +20,6 @@
 			"Comment": "release-101",
 			"Rev": "e1c259484b495133836706f46319f5897f1e9bf6"
 		},
-		{
-			"ImportPath": "github.com/GoogleCloudPlatform/gcloud-golang/compute/metadata",
-			"Rev": "542bfb014d8e28df6e27be847dfdc40c510dab1a"
-		},
 		{
 			"ImportPath": "github.com/SeanDolphin/bqschema",
 			"Rev": "a713d26df274e999ec10e9bbc7e73a1c4791053c"
@@ -200,6 +196,10 @@
 			"ImportPath": "golang.org/x/oauth2",
 			"Rev": "ca8a464d23d55afd32571475db223e065ffd8a52"
 		},
+		{
+			"ImportPath": "google.golang.org/cloud/compute/metadata",
+			"Rev": "542bfb014d8e28df6e27be847dfdc40c510dab1a"
+		},
 		{
 			"ImportPath": "google.golang.org/cloud/internal",
 			"Rev": "542bfb014d8e28df6e27be847dfdc40c510dab1a"
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/gcloud-golang/compute/metadata/metadata.go b/Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/GoogleCloudPlatform/gcloud-golang/compute/metadata/metadata.go
rename to Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go

From 38ab53a8ff8fe5e08f9b64d35bd91a2f0fd0beb2 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Wed, 19 Aug 2015 16:07:15 -0700
Subject: [PATCH 2/3] use gcloud-golang vanity domain

---
 integration/common/gce.go | 2 +-
 utils/cloudinfo/gce.go    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/integration/common/gce.go b/integration/common/gce.go
index 8f4edd5c..0f0073a3 100644
--- a/integration/common/gce.go
+++ b/integration/common/gce.go
@@ -20,7 +20,7 @@ import (
 	"os/exec"
 	"regexp"
 
-	"github.com/GoogleCloudPlatform/gcloud-golang/compute/metadata"
+	"google.golang.org/cloud/compute/metadata"
 )
 
 var zone = flag.String("zone", "us-central1-f", "Zone the instances are running in")
diff --git a/utils/cloudinfo/gce.go b/utils/cloudinfo/gce.go
index 2ea27da2..496bbaba 100644
--- a/utils/cloudinfo/gce.go
+++ b/utils/cloudinfo/gce.go
@@ -17,8 +17,8 @@ package cloudinfo
 import (
 	"strings"
 
-	"github.com/GoogleCloudPlatform/gcloud-golang/compute/metadata"
 	info "github.com/google/cadvisor/info/v1"
+	"google.golang.org/cloud/compute/metadata"
 )
 
 func onGCE() bool {

From f50b3b11a0de896afbc507512bb54d4472016539 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Wed, 19 Aug 2015 16:19:30 -0700
Subject: [PATCH 3/3] add go1.5 target to travis build

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ca8513a7..da2d0618 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: go
 sudo: false
 go:
  - 1.4
+ - 1.5
 install:
  - true
 before_script: