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/11/23 02:23:42 UTC

(asterixdb) 03/04: Merge branch 'gerrit/neo' into 'gerrit/trinity'

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 b2449e9b6dfd35dadac938f83963aab3b8b41622
Merge: b05bc685e1 2c4f9cca51
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Tue Nov 21 00:12:40 2023 -0500

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
    Change-Id: I6be5e6c2106e34c374f42eba67060fe82b356a05

 .../asterix/api/http/server/ClusterApiServlet.java | 17 ++++++++-------
 .../src/test/resources/runtimets/api.xml           |  6 ++++++
 .../api/cluster_state_5/cluster_state_5.1.get.http | 25 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 8 deletions(-)