Merge pull request #859 from mikedanese/go1.5

use vanity domain for gcloud-golang
This commit is contained in:
Vish Kannan 2015-08-19 16:35:27 -07:00
commit 5d30b67a30
5 changed files with 7 additions and 6 deletions

View File

@ -2,6 +2,7 @@ language: go
sudo: false
go:
- 1.4
- 1.5
install:
- true
before_script:

8
Godeps/Godeps.json generated
View File

@ -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"

View File

@ -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")

View File

@ -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 {