adoroszlai opened a new pull request, #6074: URL: https://github.com/apache/ozone/pull/6074
## What changes were proposed in this pull request? Some `proto.lock` files were not updated for the 1.4.0 release. This happened because the new v0.17.0 version of `protolock` introduced a new check, which is failing for `DatanodeClientProtocol.proto` and `csi.proto`: ``` CONFLICT: "data" was moved into oneof "responseData" [DatanodeClientProtocol.proto] CONFLICT: "dataBuffers" was moved into oneof "responseData" [DatanodeClientProtocol.proto] CONFLICT: "block" was moved into oneof "access_type" [csi.proto] CONFLICT: "mount" was moved into oneof "access_type" [csi.proto] CONFLICT: "rpc" was moved into oneof "type" [csi.proto] CONFLICT: "rpc" was moved into oneof "type" [csi.proto] CONFLICT: "service" was moved into oneof "type" [csi.proto] CONFLICT: "snapshot" was moved into oneof "type" [csi.proto] CONFLICT: "volume" was moved into oneof "type" [csi.proto] CONFLICT: "volume_expansion" was moved into oneof "type" [csi.proto] ``` This PR updates `proto.lock` files: 1. eb4eaa6e8a: using v0.16.0, which can be done without conflicts 2. 42544f0712: using v0.17.0 with `--force` option, done separately for easier review https://issues.apache.org/jira/browse/HDDS-10187 ## How was this patch tested? CI: https://github.com/adoroszlai/ozone/actions/runs/7622797005 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
