steveloughran commented on a change in pull request #1897: HADOOP-16319 skip
invalid tests when default encryption enabled
URL: https://github.com/apache/hadoop/pull/1897#discussion_r394915524
##########
File path:
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AMiscOperations.java
##########
@@ -256,6 +277,7 @@ public void testS3AToStringUnitialized() throws Throwable {
}
/**
+<<<<<<< ours
Review comment:
probably best to revert and reapply. so as to avoid more confusion on
cherrypicks
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
