github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39243 from k82cn/avoid_keyword

Browse Source 
Automatic merge from submit-queue

Avoid keyword as var name.

fixes typo
This commit is contained in:
Kubernetes Submit Queue 2017-01-23 04:22:33 -08:00 committed by GitHub
commit ee70adb9e7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/genericapiserver/registry/generic/registry/store.go
View File

@ -408,8 +408,7 @@ func (e *Store) Update(ctx genericapirequest.Context, name string, objInfo rest.
if err := rest.BeforeUpdate(e.UpdateStrategy, ctx, obj, existing); err != nil { if err := rest.BeforeUpdate(e.UpdateStrategy, ctx, obj, existing); err != nil {
return nil, nil, err return nil, nil, err
} }
delete := e.shouldDelete(ctx, key, obj, existing) if e.shouldDelete(ctx, key, obj, existing) {
if delete {
deleteObj = obj deleteObj = obj
return nil, nil, errEmptiedFinalizers return nil, nil, errEmptiedFinalizers
} }