This is an automated email from the ASF dual-hosted git repository. ritik pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit b68a7cc1310c19aef1e489c307bd2bebace04ce4 Merge: 604981092c 822afae229 Author: Michael Blow <[email protected]> AuthorDate: Tue Jan 21 11:54:35 2025 -0500 Merge branch 'gerrit/trinity' into 'gerrit/morpheus' Change-Id: I0e3ab1c1dd3d18f22ee8b00978377f8059711c2b asterixdb/asterix-server/pom.xml | 13 +++ asterixdb/pom.xml | 2 +- .../originals/www.bouncycastle.org_licence.html | 102 +++++++++++++++++++++ .../content/www.bouncycastle.org_licence.html.txt | 8 ++ 4 files changed, 124 insertions(+), 1 deletion(-)
