jojochuang commented on PR #11366:
URL: https://github.com/apache/ozone/pull/11366#issuecomment-6131384852

   Rebased onto current \`master\` and force-pushed to 
\`peterxcli/HDDS-16622-if-none-match-etag\`.
   
   Conflict resolution notes:
   - \`OzoneManagerVersion.S3_IF_NONE_MATCH_ETAG\` is **16** on master 
(\`LOOKUP_FILE_REJECTS_OBS\` is 15); kept \`UNKNOWN_VERSION\` naming from 
master.
   - \`TestRpcClient\`: kept master's 
\`testListMultipartUploadsValidatesNames\` plus the new If-None-Match 
parameterized test.
   - \`TestObjectPut\`: kept \`NullAndEmptySource\` import from master.
   
   GitHub now reports the PR as mergeable; CI will need to run on the new 
commits.


-- 
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]

Reply via email to