From 63e3e84e7ec982ae25fd5b2adbef87924fe5f34a Mon Sep 17 00:00:00 2001
From: mbohlool <mehdy@google.com>
Date: Wed, 31 May 2017 23:34:00 -0700
Subject: [PATCH] Update proto

---
 .../pkg/apis/apiregistration/v1beta1/generated.proto            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/generated.proto b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/generated.proto
index 99e99b8361c..a8f712975e7 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/generated.proto
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/generated.proto
@@ -105,6 +105,8 @@ message APIServiceSpec {
 message APIServiceStatus {
   // Current service state of apiService.
   // +optional
+  // +patchMergeKey=type
+  // +patchStrategy=merge
   repeated APIServiceCondition conditions = 1;
 }