diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 79f29315f72..e83f79f87d5 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1146,10 +1146,6 @@ "ImportPath": "k8s.io/heapster/metrics/api/v1/types", "Comment": "v1.1.0-beta1-15-gde510e4", "Rev": "de510e4bdcdea96722b5bde19ff0b7a142939485" - }, - { - "ImportPath": "speter.net/go/exp/math/dec/inf", - "Rev": "42ca6cd68aa922bc3f32f1e056e61b65945d9ad7" } ] } diff --git a/federation/apis/federation/types.generated.go b/federation/apis/federation/types.generated.go index dc3172d12b9..81749c927d8 100644 --- a/federation/apis/federation/types.generated.go +++ b/federation/apis/federation/types.generated.go @@ -24,15 +24,16 @@ package federation import ( "errors" "fmt" + "reflect" + "runtime" + time "time" + codec1978 "github.com/ugorji/go/codec" + pkg4_inf "gopkg.in/inf.v0" pkg1_api "k8s.io/kubernetes/pkg/api" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg5_types "k8s.io/kubernetes/pkg/types" - "reflect" - "runtime" - pkg4_inf "speter.net/go/exp/math/dec/inf" - time "time" ) const ( diff --git a/federation/apis/federation/v1alpha1/types.generated.go b/federation/apis/federation/v1alpha1/types.generated.go index 66b557731fe..77576859419 100644 --- a/federation/apis/federation/v1alpha1/types.generated.go +++ b/federation/apis/federation/v1alpha1/types.generated.go @@ -24,15 +24,16 @@ package v1alpha1 import ( "errors" "fmt" + "reflect" + "runtime" + time "time" + codec1978 "github.com/ugorji/go/codec" + pkg4_inf "gopkg.in/inf.v0" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg1_v1 "k8s.io/kubernetes/pkg/api/v1" pkg5_types "k8s.io/kubernetes/pkg/types" - "reflect" - "runtime" - pkg4_inf "speter.net/go/exp/math/dec/inf" - time "time" ) const ( diff --git a/pkg/api/helpers_test.go b/pkg/api/helpers_test.go index 2d6bd488f09..142cf7307e0 100644 --- a/pkg/api/helpers_test.go +++ b/pkg/api/helpers_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/labels" - "speter.net/go/exp/math/dec/inf" + inf "gopkg.in/inf.v0" ) func TestConversionError(t *testing.T) { diff --git a/pkg/api/resource/deep_copy_generated.go b/pkg/api/resource/deep_copy_generated.go index 7b5e33fbd6f..14e5ff468fc 100644 --- a/pkg/api/resource/deep_copy_generated.go +++ b/pkg/api/resource/deep_copy_generated.go @@ -21,8 +21,8 @@ limitations under the License. package resource import ( + inf "gopkg.in/inf.v0" conversion "k8s.io/kubernetes/pkg/conversion" - inf "speter.net/go/exp/math/dec/inf" ) func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error { diff --git a/pkg/api/resource/quantity.go b/pkg/api/resource/quantity.go index aeb43c89767..e61c8800ec4 100644 --- a/pkg/api/resource/quantity.go +++ b/pkg/api/resource/quantity.go @@ -24,7 +24,8 @@ import ( "strings" flag "github.com/spf13/pflag" - "speter.net/go/exp/math/dec/inf" + + inf "gopkg.in/inf.v0" ) // Quantity is a fixed-point representation of a number. diff --git a/pkg/api/resource/quantity_proto.go b/pkg/api/resource/quantity_proto.go index 9e101260fad..01d5c2997ea 100644 --- a/pkg/api/resource/quantity_proto.go +++ b/pkg/api/resource/quantity_proto.go @@ -19,7 +19,7 @@ package resource import ( "math/big" - "speter.net/go/exp/math/dec/inf" + inf "gopkg.in/inf.v0" ) // QuantityProto is a struct that is equivalent to Quantity, but intended for diff --git a/pkg/api/resource/quantity_test.go b/pkg/api/resource/quantity_test.go index 68806b749e8..66d1563a27c 100644 --- a/pkg/api/resource/quantity_test.go +++ b/pkg/api/resource/quantity_test.go @@ -23,7 +23,8 @@ import ( fuzz "github.com/google/gofuzz" "github.com/spf13/pflag" - "speter.net/go/exp/math/dec/inf" + + inf "gopkg.in/inf.v0" ) var ( diff --git a/pkg/api/types.generated.go b/pkg/api/types.generated.go index 475341a1607..6400b796580 100644 --- a/pkg/api/types.generated.go +++ b/pkg/api/types.generated.go @@ -34,7 +34,7 @@ import ( pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" - pkg4_inf "speter.net/go/exp/math/dec/inf" + pkg4_inf "gopkg.in/inf.v0" time "time" ) diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index 0d8b9e66799..a3631d00c75 100644 --- a/pkg/api/v1/conversion.go +++ b/pkg/api/v1/conversion.go @@ -19,10 +19,11 @@ package v1 import ( "fmt" + inf "gopkg.in/inf.v0" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" - "speter.net/go/exp/math/dec/inf" ) const ( diff --git a/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index 5d53f54fdb8..826a1a320ef 100644 --- a/pkg/api/v1/types.generated.go +++ b/pkg/api/v1/types.generated.go @@ -32,7 +32,7 @@ import ( pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" - pkg4_inf "speter.net/go/exp/math/dec/inf" + pkg4_inf "gopkg.in/inf.v0" time "time" ) diff --git a/pkg/apis/apps/types.generated.go b/pkg/apis/apps/types.generated.go index a7678c6b7fc..4b7ccefc365 100644 --- a/pkg/apis/apps/types.generated.go +++ b/pkg/apis/apps/types.generated.go @@ -24,16 +24,17 @@ package apps import ( "errors" "fmt" + "reflect" + "runtime" + time "time" + codec1978 "github.com/ugorji/go/codec" + pkg5_inf "gopkg.in/inf.v0" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" - "reflect" - "runtime" - pkg5_inf "speter.net/go/exp/math/dec/inf" - time "time" ) const ( diff --git a/pkg/apis/apps/v1alpha1/types.generated.go b/pkg/apis/apps/v1alpha1/types.generated.go index c96b70d3074..f0db024af1d 100644 --- a/pkg/apis/apps/v1alpha1/types.generated.go +++ b/pkg/apis/apps/v1alpha1/types.generated.go @@ -24,16 +24,17 @@ package v1alpha1 import ( "errors" "fmt" + "reflect" + "runtime" + time "time" + codec1978 "github.com/ugorji/go/codec" + pkg5_inf "gopkg.in/inf.v0" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" - "reflect" - "runtime" - pkg5_inf "speter.net/go/exp/math/dec/inf" - time "time" ) const ( diff --git a/pkg/apis/batch/types.generated.go b/pkg/apis/batch/types.generated.go index 75b59562aa7..5085aa32efb 100644 --- a/pkg/apis/batch/types.generated.go +++ b/pkg/apis/batch/types.generated.go @@ -24,16 +24,17 @@ package batch import ( "errors" "fmt" + "reflect" + "runtime" + time "time" + codec1978 "github.com/ugorji/go/codec" + pkg5_inf "gopkg.in/inf.v0" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" - "reflect" - "runtime" - pkg5_inf "speter.net/go/exp/math/dec/inf" - time "time" ) const ( diff --git a/pkg/apis/batch/v1/types.generated.go b/pkg/apis/batch/v1/types.generated.go index 3680c8c64cf..defb7a22d00 100644 --- a/pkg/apis/batch/v1/types.generated.go +++ b/pkg/apis/batch/v1/types.generated.go @@ -24,16 +24,17 @@ package v1 import ( "errors" "fmt" + "reflect" + "runtime" + time "time" + codec1978 "github.com/ugorji/go/codec" + pkg5_inf "gopkg.in/inf.v0" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" - "reflect" - "runtime" - pkg5_inf "speter.net/go/exp/math/dec/inf" - time "time" ) const ( diff --git a/pkg/apis/batch/v2alpha1/types.generated.go b/pkg/apis/batch/v2alpha1/types.generated.go index 08ac59e8e3b..2b683088fd3 100644 --- a/pkg/apis/batch/v2alpha1/types.generated.go +++ b/pkg/apis/batch/v2alpha1/types.generated.go @@ -24,16 +24,17 @@ package v2alpha1 import ( "errors" "fmt" + "reflect" + "runtime" + time "time" + codec1978 "github.com/ugorji/go/codec" + pkg5_inf "gopkg.in/inf.v0" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" - "reflect" - "runtime" - pkg5_inf "speter.net/go/exp/math/dec/inf" - time "time" ) const ( diff --git a/pkg/apis/extensions/types.generated.go b/pkg/apis/extensions/types.generated.go index 9b20d0d7cd0..2afafd6a3db 100644 --- a/pkg/apis/extensions/types.generated.go +++ b/pkg/apis/extensions/types.generated.go @@ -32,7 +32,7 @@ import ( pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" - pkg5_inf "speter.net/go/exp/math/dec/inf" + pkg5_inf "gopkg.in/inf.v0" time "time" ) diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index 7f82d21e7a8..b5a84b0ad06 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -32,7 +32,7 @@ import ( pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" - pkg5_inf "speter.net/go/exp/math/dec/inf" + pkg5_inf "gopkg.in/inf.v0" time "time" ) diff --git a/pkg/controller/petset/fakes.go b/pkg/controller/petset/fakes.go index ddbaff1b073..61ba2375b7d 100644 --- a/pkg/controller/petset/fakes.go +++ b/pkg/controller/petset/fakes.go @@ -20,6 +20,8 @@ import ( "fmt" "time" + inf "gopkg.in/inf.v0" + "k8s.io/kubernetes/pkg/api" api_pod "k8s.io/kubernetes/pkg/api/pod" "k8s.io/kubernetes/pkg/api/resource" @@ -28,7 +30,6 @@ import ( "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/sets" - "speter.net/go/exp/math/dec/inf" ) func dec(i int64, exponent int) *inf.Dec { diff --git a/test/e2e/petset.go b/test/e2e/petset.go index f78024aa60a..82dbb51c3ce 100644 --- a/test/e2e/petset.go +++ b/test/e2e/petset.go @@ -21,6 +21,8 @@ import ( "strconv" "time" + inf "gopkg.in/inf.v0" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" @@ -32,7 +34,6 @@ import ( "k8s.io/kubernetes/pkg/controller/petset" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" - "speter.net/go/exp/math/dec/inf" ) const (