github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21223 from hongchaodeng/fix

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-22 07:41:45 -08:00
parent c533ae4dd0 0d89cfd6e5
commit 90d1276507
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/storage/etcd/etcd_helper.go
View File

@@ -246,9 +246,6 @@ func (h *etcdHelper) Set(ctx context.Context, key string, obj, out runtime.Objec
metrics.RecordEtcdRequestLatency("create", getTypeName(obj), startTime) metrics.RecordEtcdRequestLatency("create", getTypeName(obj), startTime)
} }
if err != nil {
return err
}
if out != nil { if out != nil {
if _, err := conversion.EnforcePtr(out); err != nil { if _, err := conversion.EnforcePtr(out); err != nil {
panic("unable to convert output object to pointer") panic("unable to convert output object to pointer")