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

Posted to commits@asterixdb.apache.org by ht...@apache.org on 2022/09/16 05:04:08 UTC

[asterixdb] 05/05: Merge "Merge branch gerrit/neo"

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

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

commit 269aa08a2cb903c7103f7a97a97bd13da24a056d
Merge: b1b23196be 4179960feb
Author: Apache AsterixDB Gerrit <de...@asterixdb.apache.org>
AuthorDate: Fri Sep 16 04:46:56 2022 +0000

    Merge "Merge branch gerrit/neo"

 .../apache/asterix/external/util/HDFSUtils.java    |  5 ++-
 .../asterix/runtime/utils/ClusterStateManager.java |  1 +
 asterixdb/asterix-server/pom.xml                   | 17 ++++-----
 asterixdb/pom.xml                                  |  4 +--
 .../appended-resources/supplemental-models.xml     | 32 +++++++++++------
 ...ontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt} |  0
 ...ercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt | 21 +++++++++++
 .../apache/hyracks/hdfs/scheduler/Scheduler.java   | 42 ++++++++++------------
 .../apache/hyracks/hdfs2/scheduler/Scheduler.java  | 17 ++++-----
 9 files changed, 81 insertions(+), 58 deletions(-)