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"

Merge pull request #29045 from lixiaobing10051267/mastererrNotAcceptable
1e9edfc5 · k8s-merge-robot · GitHub · 8f8e6205 · 7ecae854 · 1e9edfc5
Commit 1e9edfc5 authored Jul 19, 2016 by k8s-merge-robot Committed by GitHub Jul 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

errors.go pkg/apiserver/errors.go +1 -1

No files found.
--- a/pkg/apiserver/errors.go
+++ b/pkg/apiserver/errors.go
@@ -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