Merge pull request #12227 from freeformz/remove_code_google_com

s:code.google.com/p:github.com/scalingdata:

Godeps/Godeps.json

@@ -14,10 +14,6 @@
 			"Comment": "null-5",
 			"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
 		},
-		{
-			"ImportPath": "code.google.com/p/gcfg",
-			"Rev": "c2d3050044d05357eaf6c3547249ba57c5e235cb"
-		},
 		{
 			"ImportPath": "github.com/Sirupsen/logrus",
 			"Comment": "v0.6.2-10-g51fe59a",
@@ -501,6 +497,10 @@
 			"ImportPath": "github.com/samuel/go-zookeeper/zk",
 			"Rev": "d0e0d8e11f318e000a8cc434616d69e329edc374"
 		},
+		{
+			"ImportPath": "github.com/scalingdata/gcfg",
+			"Rev": "37aabad69cfd3d20b8390d902a8b10e245c615ff"
+		},
 		{
 			"ImportPath": "github.com/shurcooL/sanitized_anchor_name",
 			"Rev": "9a8b7d4e8f347bfa230879db9d7d4e4d9e19f962"

Godeps/_workspace/src/github.com/scalingdata/gcfg/example_test.go

@@ -5,7 +5,7 @@ import (
 	"log"
 )
 
-import "code.google.com/p/gcfg"
+import "github.com/scalingdata/gcfg"
 
 func ExampleReadStringInto() {
 	cfgStr := `; Comment line

Godeps/_workspace/src/github.com/scalingdata/gcfg/read.go

@@ -9,8 +9,8 @@ import (
 )
 
 import (
-	"code.google.com/p/gcfg/scanner"
+	"github.com/scalingdata/gcfg/scanner"
-	"code.google.com/p/gcfg/token"
+	"github.com/scalingdata/gcfg/token"
 )
 
 var unescape = map[rune]rune{'\\': '\\', '"': '"', 'n': '\n', 't': '\t'}

Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/errors.go

@@ -11,7 +11,7 @@ import (
 )
 
 import (
-	"code.google.com/p/gcfg/token"
+	"github.com/scalingdata/gcfg/token"
 )
 
 // In an ErrorList, an error is represented by an *Error.

Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/example_test.go

@@ -9,8 +9,8 @@ import (
 )
 
 import (
-	"code.google.com/p/gcfg/scanner"
+	"github.com/scalingdata/gcfg/scanner"
-	"code.google.com/p/gcfg/token"
+	"github.com/scalingdata/gcfg/token"
 )
 
 func ExampleScanner_Scan() {

Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/scanner.go

@@ -19,7 +19,7 @@ import (
 )
 
 import (
-	"code.google.com/p/gcfg/token"
+	"github.com/scalingdata/gcfg/token"
 )
 
 // An ErrorHandler may be provided to Scanner.Init. If a syntax error is

Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/scanner_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 import (
-	"code.google.com/p/gcfg/token"
+	"github.com/scalingdata/gcfg/token"
 )
 
 var fset = token.NewFileSet()

Godeps/_workspace/src/github.com/scalingdata/gcfg/set.go

@@ -8,7 +8,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"code.google.com/p/gcfg/types"
+	"github.com/scalingdata/gcfg/types"
 )
 
 type tag struct {

contrib/mesos/pkg/scheduler/config/config.go

@@ -20,7 +20,7 @@ import (
 	"io"
 	"time"
 
-	"code.google.com/p/gcfg"
+	"github.com/scalingdata/gcfg"
 )
 
 const (

pkg/cloudprovider/providers/aws/aws.go

@@ -30,13 +30,13 @@ import (
 	"sync"
 	"time"
 
-	"code.google.com/p/gcfg"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/elb"
+	"github.com/scalingdata/gcfg"
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/cloudprovider"

pkg/cloudprovider/providers/gce/gce.go

@@ -31,8 +31,8 @@ import (
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/wait"
 
-	"code.google.com/p/gcfg"
 	"github.com/golang/glog"
+	"github.com/scalingdata/gcfg"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	compute "google.golang.org/api/compute/v1"

pkg/cloudprovider/providers/mesos/config.go

@@ -20,7 +20,7 @@ import (
 	"io"
 	"time"
 
-	"code.google.com/p/gcfg"
+	"github.com/scalingdata/gcfg"
 )
 
 const (

pkg/cloudprovider/providers/openstack/openstack.go

@@ -27,7 +27,6 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/gcfg"
 	"github.com/rackspace/gophercloud"
 	"github.com/rackspace/gophercloud/openstack"
 	"github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes"
@@ -39,6 +38,7 @@ import (
 	"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools"
 	"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips"
 	"github.com/rackspace/gophercloud/pagination"
+	"github.com/scalingdata/gcfg"
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"

pkg/cloudprovider/providers/ovirt/ovirt.go

@@ -29,7 +29,7 @@ import (
 	"sort"
 	"strings"
 
-	"code.google.com/p/gcfg"
+	"github.com/scalingdata/gcfg"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/cloudprovider"
 )

pkg/cloudprovider/providers/rackspace/rackspace.go

@@ -24,12 +24,12 @@ import (
 	"regexp"
 	"time"
 
-	"code.google.com/p/gcfg"
 	"github.com/rackspace/gophercloud"
 	os_servers "github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 	"github.com/rackspace/gophercloud/pagination"
 	"github.com/rackspace/gophercloud/rackspace"
 	"github.com/rackspace/gophercloud/rackspace/compute/v2/servers"
+	"github.com/scalingdata/gcfg"
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"