adding a apiserver log message when patch fails because a meaningful …

…conflict
332054781 · Feb 23, 2016 · 78fc311 · 78fc311
1 parent 6a19970
commit 78fc311
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pkg/apiserver/resthandler.go b/pkg/apiserver/resthandler.go
@@ -589,6 +589,7 @@ func patchResource(ctx api.Context, admit updateAdmissionFunc, timeout time.Dura
 				return nil, err
 			}
 			if hasConflicts {
+				glog.V(4).Infof("patchResource failed for resource %s, becauase there is a meaningful conflict.\n diff1=%v\n, diff2=%v\n", name, diff1, diff2)
 				return updateObject, updateErr
 			}