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 4b97aa968df34645a0a34a647dcb4f1ceaeb954a Merge: 227f4f32f9 ddd024fd1d Author: Apache AsterixDB Gerrit <[email protected]> AuthorDate: Wed Nov 27 16:04:07 2024 +0000 Merge "Merge branch 'gerrit/trinity' into 'gerrit/goldfish'" into goldfish asterixdb/pom.xml | 2 +- .../appended-resources/supplemental-models.xml | 36 ++++++++++------------ ...-library-for-java_refs_tags_v1.17.1_LICENSE.txt | 21 +++++++++++++ ...e-sdk-for-java_azure-identity_1.9.0_LICENSE.txt | 21 ------------- ...ava_refs_tags_azure-identity_1.13.3_NOTICE.txt} | 22 ++++++++++++- 5 files changed, 59 insertions(+), 43 deletions(-)
