kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49195 from huangjiuyuan/fix-typo 

Automatic merge from submit-queue

fix typo in staging/src/k8s.io/apiserver/pkg/server/config.go

**What this PR does / why we need it**: Fix a typo `It's members are sorted roughly in order of importance for composers.` in `staging/src/k8s.io/apiserver/pkg/server/config.go`.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

`NONE`

Kubernetes-commit: 2bd0b3dd2616e5c4a6ef79d08dfb8bc8f5959ced
This commit is contained in:
Kubernetes Publisher 2017-08-03 07:34:43 -07:00
parent 06ea0476f0 c229fe60e4
commit 2c66dfcbee
2 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
Godeps/Godeps.json generated
View File

@ -804,235 +804,235 @@
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/proxy",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c"
"Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
},
{
"ImportPath": "k8s.io/client-go/discovery",

2
pkg/server/config.go
View File

@ -74,7 +74,7 @@ const (
)
// Config is a structure used to configure a GenericAPIServer.
// It's members are sorted roughly in order of importance for composers.
// Its members are sorted roughly in order of importance for composers.
type Config struct {
// SecureServingInfo is required to serve https
SecureServingInfo *SecureServingInfo