diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 7fecb9eff71..1a0e19fb676 100644 --- a/Godeps/Godeps.json +++ b/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" diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/LICENSE b/Godeps/_workspace/src/github.com/scalingdata/gcfg/LICENSE similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/LICENSE rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/LICENSE diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/README b/Godeps/_workspace/src/github.com/scalingdata/gcfg/README similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/README rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/README diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/doc.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/doc.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/doc.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/doc.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/example_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/example_test.go similarity index 98% rename from Godeps/_workspace/src/code.google.com/p/gcfg/example_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/example_test.go index 884f3fb717b..7fa554c0837 100644 --- a/Godeps/_workspace/src/code.google.com/p/gcfg/example_test.go +++ b/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 diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/go1_0.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/go1_0.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/go1_0.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/go1_0.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/go1_2.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/go1_2.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/go1_2.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/go1_2.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/issues_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/issues_test.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/issues_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/issues_test.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/read.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/read.go similarity index 98% rename from Godeps/_workspace/src/code.google.com/p/gcfg/read.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/read.go index 4719c2ba026..280ec77ec3f 100644 --- a/Godeps/_workspace/src/code.google.com/p/gcfg/read.go +++ b/Godeps/_workspace/src/github.com/scalingdata/gcfg/read.go @@ -9,8 +9,8 @@ import ( ) import ( - "code.google.com/p/gcfg/scanner" - "code.google.com/p/gcfg/token" + "github.com/scalingdata/gcfg/scanner" + "github.com/scalingdata/gcfg/token" ) var unescape = map[rune]rune{'\\': '\\', '"': '"', 'n': '\n', 't': '\t'} diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/read_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/read_test.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/read_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/read_test.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/scanner/errors.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/errors.go similarity index 98% rename from Godeps/_workspace/src/code.google.com/p/gcfg/scanner/errors.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/errors.go index 4ff920a2cf6..e33d656a32c 100644 --- a/Godeps/_workspace/src/code.google.com/p/gcfg/scanner/errors.go +++ b/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. diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/scanner/example_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/example_test.go similarity index 93% rename from Godeps/_workspace/src/code.google.com/p/gcfg/scanner/example_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/example_test.go index 05eadf575bf..1a15f6b78df 100644 --- a/Godeps/_workspace/src/code.google.com/p/gcfg/scanner/example_test.go +++ b/Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/example_test.go @@ -9,8 +9,8 @@ import ( ) import ( - "code.google.com/p/gcfg/scanner" - "code.google.com/p/gcfg/token" + "github.com/scalingdata/gcfg/scanner" + "github.com/scalingdata/gcfg/token" ) func ExampleScanner_Scan() { diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/scanner/scanner.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/scanner.go similarity index 99% rename from Godeps/_workspace/src/code.google.com/p/gcfg/scanner/scanner.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/scanner.go index f65a4f5bc06..462c87eec3e 100644 --- a/Godeps/_workspace/src/code.google.com/p/gcfg/scanner/scanner.go +++ b/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 diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/scanner/scanner_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/scanner_test.go similarity index 99% rename from Godeps/_workspace/src/code.google.com/p/gcfg/scanner/scanner_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/scanner/scanner_test.go index 33227c1b476..e4015736e09 100644 --- a/Godeps/_workspace/src/code.google.com/p/gcfg/scanner/scanner_test.go +++ b/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() diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/set.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/set.go similarity index 99% rename from Godeps/_workspace/src/code.google.com/p/gcfg/set.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/set.go index 4e15604084c..5fa8b7f6e48 100644 --- a/Godeps/_workspace/src/code.google.com/p/gcfg/set.go +++ b/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 { diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/testdata/gcfg_test.gcfg b/Godeps/_workspace/src/github.com/scalingdata/gcfg/testdata/gcfg_test.gcfg similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/testdata/gcfg_test.gcfg rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/testdata/gcfg_test.gcfg diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/testdata/gcfg_unicode_test.gcfg b/Godeps/_workspace/src/github.com/scalingdata/gcfg/testdata/gcfg_unicode_test.gcfg similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/testdata/gcfg_unicode_test.gcfg rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/testdata/gcfg_unicode_test.gcfg diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/token/position.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/token/position.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/token/position.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/token/position.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/token/position_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/token/position_test.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/token/position_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/token/position_test.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/token/serialize.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/token/serialize.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/token/serialize.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/token/serialize.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/token/serialize_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/token/serialize_test.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/token/serialize_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/token/serialize_test.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/token/token.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/token/token.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/token/token.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/token/token.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/types/bool.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/types/bool.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/types/bool.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/types/bool.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/types/doc.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/types/doc.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/types/doc.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/types/doc.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/types/enum.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/types/enum.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/types/enum.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/types/enum.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/types/enum_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/types/enum_test.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/types/enum_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/types/enum_test.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/types/int.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/types/int.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/types/int.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/types/int.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/types/int_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/types/int_test.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/types/int_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/types/int_test.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/types/scan.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/types/scan.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/types/scan.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/types/scan.go diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/types/scan_test.go b/Godeps/_workspace/src/github.com/scalingdata/gcfg/types/scan_test.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/gcfg/types/scan_test.go rename to Godeps/_workspace/src/github.com/scalingdata/gcfg/types/scan_test.go diff --git a/contrib/mesos/pkg/scheduler/config/config.go b/contrib/mesos/pkg/scheduler/config/config.go index 5290729b482..afe5d6acb08 100644 --- a/contrib/mesos/pkg/scheduler/config/config.go +++ b/contrib/mesos/pkg/scheduler/config/config.go @@ -20,7 +20,7 @@ import ( "io" "time" - "code.google.com/p/gcfg" + "github.com/scalingdata/gcfg" ) const ( diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index c40d06452ca..d216232557f 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/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" diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index e5a1bb3ead8..fbe172ab23f 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/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" diff --git a/pkg/cloudprovider/providers/mesos/config.go b/pkg/cloudprovider/providers/mesos/config.go index bd62aca588b..c1be30e8bd1 100644 --- a/pkg/cloudprovider/providers/mesos/config.go +++ b/pkg/cloudprovider/providers/mesos/config.go @@ -20,7 +20,7 @@ import ( "io" "time" - "code.google.com/p/gcfg" + "github.com/scalingdata/gcfg" ) const ( diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index 62d345e64a4..8bf1ef69d90 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/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" diff --git a/pkg/cloudprovider/providers/ovirt/ovirt.go b/pkg/cloudprovider/providers/ovirt/ovirt.go index 50279f9ece3..19688d83d0f 100644 --- a/pkg/cloudprovider/providers/ovirt/ovirt.go +++ b/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" ) diff --git a/pkg/cloudprovider/providers/rackspace/rackspace.go b/pkg/cloudprovider/providers/rackspace/rackspace.go index 906c67a6b13..399a37f9e78 100644 --- a/pkg/cloudprovider/providers/rackspace/rackspace.go +++ b/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"