Merge pull request #29045 from lixiaobing10051267/mastererrNotAcceptable

Automatic merge from submit-queue

Type define note "errNotAcceptable" should be "errUnsupportedMediaType"

In file "pkg\apiserver\errors.go", line 129:
"// errNotAcceptable indicates Content-Type is not recognized"
Here "errNotAcceptable" shuould be "errUnsupportedMediaType", thus consistent with line 131:
"type errUnsupportedMediaType struct"
This commit is contained in:
k8s-merge-robot 2016-07-19 01:10:41 -07:00 committed by GitHub
commit 1e9edfc5c3

2
pkg/apiserver/errors.go Normal file → Executable file
View File

@ -133,7 +133,7 @@ func (e errNotAcceptable) Status() unversioned.Status {
}
}
// errNotAcceptable indicates Content-Type is not recognized
// errUnsupportedMediaType indicates Content-Type is not recognized
// TODO: move to api/errors if other code needs to return this
type errUnsupportedMediaType struct {
accepted []string