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)"

Merge pull request #29047 from lixiaobing10051267/masterServe
61087258 · k8s-merge-robot · GitHub · d08a7226 · 97219275 · 61087258
Commit 61087258 authored Jul 18, 2016 by k8s-merge-robot Committed by GitHub Jul 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

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