Merge branch 'versioning-override' of github.com:temporalio/api into versioning-override

Author: carlydf

temporal/api/deployment/v1/message.proto

@@ -218,7 +218,7 @@ message WorkerDeploymentInfo {
     }
 }
 
-// A Worker Deployment Version (Version, for short) represents a different
+// A Worker Deployment Version (Version, for short) represents a
 // version of workers within a Worker Deployment. (see documentation of WorkerDeploymentVersionInfo)
 // Version records are created in Temporal server automatically when their
 // first poller arrives to the server.

temporal/api/workflow/v1/message.proto

@@ -573,7 +573,7 @@ message VersioningOverride {
     string pinned_version = 9 [deprecated = true];
 
     message PinnedOverride {
-        PinnedOverrideBehavior type = 1;
+        PinnedOverrideBehavior behavior = 1;
         temporal.api.deployment.v1.WorkerDeploymentVersion version = 2;
     }
 

temporal/api/workflowservice/v1/request_response.proto

@@ -2067,7 +2067,7 @@ message SetWorkerDeploymentCurrentVersionResponse {
     // Deprecated. Use `previous_current`.
     string previous_version = 2 [deprecated = true];
     // The version that was current before executing this operation.
-    oneof previous_current {
+    oneof replaced_version {
         temporal.api.deployment.v1.WorkerDeploymentVersion deployment_version = 3;
         bool unversioned = 4;
     };
@@ -2124,7 +2124,7 @@ message SetWorkerDeploymentRampingVersionResponse {
     // Deprecated. Use `previous_ramping`.
     string previous_version = 2 [deprecated = true];
     // The version that was ramping before executing this operation.
-    oneof previous_ramping {
+    oneof replaced_ramping {
         temporal.api.deployment.v1.WorkerDeploymentVersion deployment_version = 4;
         bool unversioned = 5;
     };