Merge pull request google#1466 from timstclair/revert

Revert "Moved google.golang.org/cloud/compute/metadata to cloud.googl…
WIZARD-CXY · Sep 19, 2016 · 2849a88 · 2849a88
2 parents e380a57 + 0b4de74
commit 2849a88
Show file tree

Hide file tree

Showing 9 changed files with 238 additions and 583 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/utils/cloudinfo/gce.go b/utils/cloudinfo/gce.go
@@ -20,8 +20,8 @@ import (
 
 	info "github.com/google/cadvisor/info/v1"
 
-	"cloud.google.com/go/compute/metadata"
 	"github.com/golang/glog"
+	"google.golang.org/cloud/compute/metadata"
 )
 
 const (