This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from b9fdbc3beb Fix use of ServiceLockData Optional and nulls (#3788) add 84d034589d Clean up Thrift SSL code (#3787) new 19b4c508bf Merge branch '2.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../rpc/ProtocolOverridingSSLSocketFactory.java | 111 --------------------- .../accumulo/core/rpc/SslConnectionParams.java | 20 +--- .../org/apache/accumulo/core/rpc/ThriftUtil.java | 108 +------------------- .../apache/accumulo/server/rpc/TServerUtils.java | 2 +- 4 files changed, 8 insertions(+), 233 deletions(-) delete mode 100644 core/src/main/java/org/apache/accumulo/core/rpc/ProtocolOverridingSSLSocketFactory.java