Level sets dependency graph to consume etcd 3.1.5

Kubernetes-commit: 93c051e28fc43ed35cb9074f6de5a8c4de799eb2
This commit is contained in:
Timothy St. Clair
2017-04-04 20:54:55 -05:00
committed by Kubernetes Publisher
parent 0865289f28
commit 656cf48fd6
44 changed files with 13014 additions and 13122 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -167,8 +167,6 @@ message DeploymentStatus {
optional int32 unavailableReplicas = 5;
// Represents the latest available observations of a deployment's current state.
// +patchMergeKey=type
// +patchStrategy=merge
repeated DeploymentCondition conditions = 6;
}

View File

@@ -327,8 +327,6 @@ type DeploymentStatus struct {
UnavailableReplicas int32 `json:"unavailableReplicas,omitempty" protobuf:"varint,5,opt,name=unavailableReplicas"`
// Represents the latest available observations of a deployment's current state.
// +patchMergeKey=type
// +patchStrategy=merge
Conditions []DeploymentCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,6,rep,name=conditions"`
}