From 78fc311f1ff15b7f0d944a3c6a7c55f6e4ad0fab Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Mon, 22 Feb 2016 16:41:34 -0800
Subject: [PATCH] adding a apiserver log message when patch fails because a
 meaningful conflict

---
 pkg/apiserver/resthandler.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/apiserver/resthandler.go b/pkg/apiserver/resthandler.go
index 046d955de1..fd24f1f822 100644
--- 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
 			}