Merge pull request #25552 from caesarxuchao/merge-finalizers

add merge tag to v1/ObjectMeta.Finalizers

Merge pull request #25552 from caesarxuchao/merge-finalizers
177c0efe · Jeff Lowdermilk · ce803725 · 6f1521af · 177c0efe
Commit 177c0efe authored May 13, 2016 by Jeff Lowdermilk
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

types.go pkg/api/v1/types.go +1 -1

No files found.
--- a/pkg/api/v1/types.go
+++ b/pkg/api/v1/types.go
@@ -184,7 +184,7 @@ type ObjectMeta struct {
 	// is an identifier for the responsible component that will remove the entry
 	// from the list. If the deletionTimestamp of the object is non-nil, entries
 	// in this list can only be removed.
-	Finalizers []string `json:"finalizers,omitempty" protobuf:"bytes,14,rep,name=finalizers"`
+	Finalizers []string `json:"finalizers,omitempty" patchStrategy:"merge" protobuf:"bytes,14,rep,name=finalizers"`
 }

 const (