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 2022/02/15 14:25:17 UTC

[asterixdb] 05/05: Merge branch '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 349915efbc05b318236dc0d18f132a0be3eee491
Merge: b3fb199 a6c858b
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Feb 15 08:22:30 2022 -0500

    Merge branch 'gerrit/neo'
    
    Change-Id: Id22e3b96e31924a90c2cc7c7dee2aa828ba18ac6

 .../asterix/api/http/server/NCQueryServiceServlet.java       |  6 ++++++
 .../org/apache/asterix/api/http/server/NCUdfApiServlet.java  |  7 +++----
 .../main/java/org/apache/asterix/app/nc/ReplicaManager.java  | 12 ++++++------
 .../java/org/apache/asterix/common/context/DatasetInfo.java  |  2 ++
 .../java/org/apache/asterix/common/context/IndexInfo.java    |  6 ++++++
 .../org/apache/asterix/common/storage/IReplicaManager.java   |  6 +++---
 .../messaging/PartitionResourcesListResponse.java            |  2 +-
 .../replication/messaging/PartitionResourcesListTask.java    |  2 +-
 .../apache/asterix/replication/sync/FileSynchronizer.java    |  2 +-
 .../apache/asterix/replication/sync/IndexSynchronizer.java   |  2 +-
 .../asterix/replication/sync/ReplicaFilesSynchronizer.java   |  8 ++++----
 .../apache/asterix/replication/sync/ReplicaSynchronizer.java |  2 +-
 .../java/org/apache/hyracks/http/server/utils/HttpUtil.java  |  8 +++++++-
 13 files changed, 42 insertions(+), 23 deletions(-)