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

Posted to commits@asterixdb.apache.org by mh...@apache.org on 2020/11/17 20:40:13 UTC

[asterixdb] 03/03: Merge "Merge commit '3072d1' into master"

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

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

commit 5fec88367d112e81e431bf48e4204d2b5b91f7a4
Merge: 4b4de18 7ed56ef
Author: Apache AsterixDB Gerrit <de...@asterixdb.apache.org>
AuthorDate: Tue Nov 17 20:26:26 2020 +0000

    Merge "Merge commit '3072d1' into master"

 .../apache/asterix/app/nc/NCAppRuntimeContext.java |  3 +-
 asterixdb/asterix-metadata/pom.xml                 |  4 ++
 .../apache/asterix/metadata/RMIClientFactory.java  | 59 ++++++++++++++++++++--
 .../metadata/bootstrap/AsterixStateProxy.java      |  2 +-
 .../api/network/INetworkSecurityConfig.java        |  3 +-
 .../ipc/security/NetworkSecurityConfig.java        |  3 +-
 .../ipc/security/NetworkSecurityManager.java       | 52 +++++++++----------
 7 files changed, 91 insertions(+), 35 deletions(-)