From fa6b60120b5d54b5f9c13b76973283e68d053f8a Mon Sep 17 00:00:00 2001 From: jianglingxia Date: Sat, 22 Jul 2017 10:07:18 +0800 Subject: [PATCH] squash the commits into one --- staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go | 2 +- staging/src/k8s.io/apiserver/pkg/endpoints/installer.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go index 16a87085633..5e4497b0eb1 100755 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go @@ -50,7 +50,7 @@ type realTimeoutFactory struct { timeout time.Duration } -// TimeoutChan returns a channel which will receive something when the watch times out, +// TimeoutCh returns a channel which will receive something when the watch times out, // and a cleanup function to call when this happens. func (w *realTimeoutFactory) TimeoutCh() (<-chan time.Time, func() bool) { if w.timeout == 0 { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go b/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go index 387162150e1..ba1b15952fa 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go @@ -84,7 +84,7 @@ var toDiscoveryKubeVerb = map[string]string{ "WATCHLIST": "watch", } -// Installs handlers for API resources. +// Install handlers for API resources. func (a *APIInstaller) Install(ws *restful.WebService) (apiResources []metav1.APIResource, errors []error) { errors = make([]error, 0) @@ -841,7 +841,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag return &apiResource, nil } -// This magic incantation returns *ptrToObject for an arbitrary pointer +// indirectArbitraryPointer returns *ptrToObject for an arbitrary pointer func indirectArbitraryPointer(ptrToObject interface{}) interface{} { return reflect.Indirect(reflect.ValueOf(ptrToObject)).Interface() }