From 6e2f13353e4e85f9feadf3fdbb55f0d95af5e14d Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 10 May 2019 13:00:31 -0700 Subject: [PATCH] Merge pull request #77735 from dims/update-beorn7/perks-to-fix-off-by-one-error-for-small-sizes Update beorn7/perks to Fix off-by-one error for small sample sizes Kubernetes-commit: e72d73b97d0d43426c939d19fd52733a8adf05cb --- Godeps/Godeps.json | 6 +++--- go.mod | 11 ++++++----- go.sum | 5 +++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 220753f..217e1cc 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -8,7 +8,7 @@ "Deps": [ { "ImportPath": "github.com/beorn7/perks", - "Rev": "3ac7bf7a47d1" + "Rev": "4c0e84591b9a" }, { "ImportPath": "github.com/blang/semver", @@ -164,11 +164,11 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "a3da69d3723c" + "Rev": "7d8f8feb49c5" }, { "ImportPath": "k8s.io/component-base", - "Rev": "40efa6d42997" + "Rev": "37ac68324a2e" }, { "ImportPath": "k8s.io/klog", diff --git a/go.mod b/go.mod index 7254db7..197a813 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager go 1.12 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/apimachinery v0.0.0-20190509063443-7d8f8feb49c5 + k8s.io/component-base v0.0.0-20190510223729-37ac68324a2e ) replace ( @@ -14,7 +14,8 @@ replace ( golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 - k8s.io/apimachinery => ../apimachinery - k8s.io/component-base => ../component-base - k8s.io/kube-controller-manager => ../kube-controller-manager + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190509063443-7d8f8feb49c5 + k8s.io/component-base => k8s.io/component-base v0.0.0-20190510223729-37ac68324a2e ) + +replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190510223910-296882b37772 diff --git a/go.sum b/go.sum index 5c4f0e1..02c625e 100644 --- a/go.sum +++ b/go.sum @@ -36,10 +36,13 @@ github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 h1:bfLnR+k0tq5Lqt6dflRLcZiz6UaXCMt3vhYJ1l4FQ80= golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db h1:6/JqlYfC1CCaLnGceQTI+sDGhC9UBSPAsBqI0Gun6kU= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20190313210603-aa82965741a9/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -51,6 +54,8 @@ gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +k8s.io/apimachinery v0.0.0-20190509063443-7d8f8feb49c5/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw= +k8s.io/component-base v0.0.0-20190510223729-37ac68324a2e/go.mod h1:Y8xLK8RovaTum8o7Bfsnzzo0jVTPg241kCziI8bTCDk= k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=