You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@asterixdb.apache.org by dl...@apache.org on 2021/02/25 18:31:16 UTC

[asterixdb] 06/07: Merge "Merge branch 'gerrit/mad-hatter'" into cheshire-cat

This is an automated email from the ASF dual-hosted git repository.

dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit aea1369a85f46a40261e609b7a3b95ade51f99f4
Merge: 01302d5 bc11c17
Author: Apache AsterixDB Gerrit <de...@asterixdb.apache.org>
AuthorDate: Thu Feb 18 03:47:56 2021 +0000

    Merge "Merge branch 'gerrit/mad-hatter'" into cheshire-cat

 .../org/apache/hyracks/ipc/impl/IPCConnectionManager.java     | 11 +++++++++--
 .../java/org/apache/hyracks/ipc/sockets/SslSocketChannel.java |  7 +++++--
 2 files changed, 14 insertions(+), 4 deletions(-)