Skip to content

Commit e4d2b3b

Browse files
committed
resolve attribute number conflict since main got merged in before this did
1 parent d419206 commit e4d2b3b

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

temporal/api/deployment/v1/message.proto

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ message WorkerDeploymentVersionInfo {
116116
google.protobuf.Timestamp ramping_since_time = 6;
117117

118118
// Timestamp when this version first became current or ramping.
119-
google.protobuf.Timestamp first_activation_time = 11;
119+
google.protobuf.Timestamp first_activation_time = 12;
120120
// Timestamp when this version last stopped being current or ramping.
121-
google.protobuf.Timestamp last_deactivation_time = 12;
121+
google.protobuf.Timestamp last_deactivation_time = 13;
122122

123123
// Range: [0, 100]. Must be zero if the version is not ramping (i.e. `ramping_since_time` is nil).
124124
// Can be in the range [0, 100] if the version is ramping.
@@ -202,21 +202,21 @@ message WorkerDeploymentInfo {
202202
enums.v1.VersionDrainageStatus drainage_status = 3;
203203
// Information about workflow drainage to help the user determine when it is safe
204204
// to decommission a Version. Not present while version is current or ramping
205-
VersionDrainageInfo drainage_info = 4;
205+
VersionDrainageInfo drainage_info = 5;
206206
// Unset if not current.
207207
// (-- api-linter: core::0140::prepositions=disabled
208208
// aip.dev/not-precedent: 'Since' captures the field semantics despite being a preposition. --)
209-
google.protobuf.Timestamp current_since_time = 5;
209+
google.protobuf.Timestamp current_since_time = 6;
210210
// Unset if not ramping. Updated when the version first starts ramping, not on each ramp change.
211211
// (-- api-linter: core::0140::prepositions=disabled
212212
// aip.dev/not-precedent: 'Since' captures the field semantics despite being a preposition. --)
213-
google.protobuf.Timestamp ramping_since_time = 6;
213+
google.protobuf.Timestamp ramping_since_time = 7;
214214
// Last time `current_since_time`, `ramping_since_time, or `ramp_percentage` of this version changed.
215-
google.protobuf.Timestamp routing_update_time = 7;
215+
google.protobuf.Timestamp routing_update_time = 8;
216216
// Timestamp when this version first became current or ramping.
217-
google.protobuf.Timestamp first_activation_time = 8;
217+
google.protobuf.Timestamp first_activation_time = 9;
218218
// Timestamp when this version last stopped being current or ramping.
219-
google.protobuf.Timestamp last_deactivation_time = 9;
219+
google.protobuf.Timestamp last_deactivation_time = 10;
220220
}
221221
}
222222

0 commit comments

Comments
 (0)