steveloughran commented on PR #4537:
URL: https://github.com/apache/hadoop/pull/4537#issuecomment-1345277471
@JackBuggins merged to trunk, but it has merge conflicts into 3.3 with
SSLFactory.java. can you do a quick review and PR there? I'm busy testing the
abfs blockers
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java
```
"ssl.server.exclude.cipher.list";
<<<<<<< HEAD
public static final String SSLCERTIFICATE = IBM_JAVA?"ibmX509":"SunX509";
=======
public static final String KEY_MANAGER_SSLCERTIFICATE =
IBM_JAVA ? "ibmX509" :
KeyManagerFactory.getDefaultAlgorithm();
public static final String TRUST_MANAGER_SSLCERTIFICATE =
IBM_JAVA ? "ibmX509" :
TrustManagerFactory.getDefaultAlgorithm();
>>>>>>> a46b20d25f1 (HADOOP-18329. Support for IBM Semeru JVM > 11.0.15.0
Vendor Name Changes (#4537))
```
--
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]
