Merge pull request #29047 from lixiaobing10051267/masterServe

Automatic merge from submit-queue

Apiserver ServeHTTP() modify

In File "pkg\apiserver\watch.go", line 123:
"// Serve serves a series of encoded events via HTTP with Transfer-Encoding: chunked"
Here "Serve" should be "ServeHTTP" because the func name is ServeHTTP:
"func (s *WatchServer) ServeHTTP(w http.ResponseWriter, req *http.Request)"
This commit is contained in:
k8s-merge-robot 2016-07-18 12:43:04 -07:00 committed by GitHub
commit 6108725869

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

@ -120,7 +120,7 @@ type WatchServer struct {
t timeoutFactory
}
// Serve serves a series of encoded events via HTTP with Transfer-Encoding: chunked
// ServeHTTP serves a series of encoded events via HTTP with Transfer-Encoding: chunked
// or over a websocket connection.
func (s *WatchServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
w = httplog.Unlogged(w)