Revert v0.12.0 Cadence merge (#59)

alexshtin · web-flow · commit e5864645a487 · 2020-06-18T08:06:54.000-07:00
diff --git a/temporal/enums/v1/workflow.proto b/temporal/enums/v1/workflow.proto
@@ -38,8 +38,6 @@ enum WorkflowIdReusePolicy {
     WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE_FAILED_ONLY = 2;
     // Do not allow start a workflow execution using the same workflow Id at all.
     WORKFLOW_ID_REUSE_POLICY_REJECT_DUPLICATE = 3;
-    // If a workflow is running using the same workflow Id, terminate it and start a new one.
-    WORKFLOW_ID_REUSE_POLICY_TERMINATE_IF_RUNNING = 4;
 }
 
 enum ParentClosePolicy {
diff --git a/temporal/workflowservice/v1/request_response.proto b/temporal/workflowservice/v1/request_response.proto
@@ -98,7 +98,6 @@ message UpdateNamespaceRequest {
     temporal.replication.v1.NamespaceReplicationConfig replication_config = 4;
     string security_token = 5;
     string delete_bad_binary = 6;
-    int32 history_archival_uri = 7;
 }
 
 message UpdateNamespaceResponse {

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ enum WorkflowIdReusePolicy {`
`38`	`38`	`WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE_FAILED_ONLY = 2;`
`39`	`39`	`// Do not allow start a workflow execution using the same workflow Id at all.`
`40`	`40`	`WORKFLOW_ID_REUSE_POLICY_REJECT_DUPLICATE = 3;`
`41`		`- // If a workflow is running using the same workflow Id, terminate it and start a new one.`
`42`		`- WORKFLOW_ID_REUSE_POLICY_TERMINATE_IF_RUNNING = 4;`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`enum ParentClosePolicy {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ message UpdateNamespaceRequest {`
`98`	`98`	`temporal.replication.v1.NamespaceReplicationConfig replication_config = 4;`
`99`	`99`	`string security_token = 5;`
`100`	`100`	`string delete_bad_binary = 6;`
`101`		`- int32 history_archival_uri = 7;`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`message UpdateNamespaceResponse {`