You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2023/08/01 03:49:01 UTC
[asterixdb] 18/20: Merge branch 'gerrit/stabilization-667a908755' into 'gerrit/neo'
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 47e2613e0cf2b975c87c930325880251fd792c6b
Merge: c1a1742a1f 641462e651
Author: Michael Blow <mb...@apache.org>
AuthorDate: Thu Jul 27 21:20:55 2023 -0400
Merge branch 'gerrit/stabilization-667a908755' into 'gerrit/neo'
Change-Id: Id7219e74699c96a473b9bbe91ad30c0ae8d16de6
.../apache/asterix/app/nc/NCAppRuntimeContext.java | 16 ++++----------
.../apache/asterix/metadata/RMIClientFactory.java | 13 ++++++++++-
.../apache/asterix/metadata/RMIServerFactory.java | 25 +++++++++++++++++++---
.../metadata/bootstrap/AsterixStateProxy.java | 15 +++----------
.../api/network/INetworkSecurityConfig.java | 9 ++++++++
.../ipc/security/NetworkSecurityConfig.java | 7 ++++++
6 files changed, 57 insertions(+), 28 deletions(-)