Merge pull request #21223 from hongchaodeng/fix

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-22 07:41:45 -08:00
commit 90d1276507

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)
}
if err != nil {
return err
}
if out != nil {
if _, err := conversion.EnforcePtr(out); err != nil {
panic("unable to convert output object to pointer")