You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2021/06/04 19:48:27 UTC
[asterixdb] 04/04: Merge branch 'cheshire-cat' into 'master'
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 28803b7822a9c846cda02bc3470b50f59806fac8
Merge: f6727a9 94eb3c2
Author: Ian Maxon <ia...@maxons.email>
AuthorDate: Fri Jun 4 09:19:27 2021 -0700
Merge branch 'cheshire-cat' into 'master'
Change-Id: Ic9ae81fa2e58954841218a1907562685c8cd19e2
asterixdb/asterix-app/pom.xml | 3 +-
.../asterix/test/sqlpp/ParserTestExecutor.java | 28 ++++----
asterixdb/asterix-common/pom.xml | 2 +-
.../context/CorrelatedPrefixMergePolicyTest.java | 2 +-
asterixdb/asterix-external-data/pom.xml | 2 +-
asterixdb/asterix-metadata/pom.xml | 2 +-
asterixdb/asterix-om/pom.xml | 24 ++++++-
asterixdb/asterix-runtime/pom.xml | 2 +-
asterixdb/asterix-transactions/pom.xml | 2 +-
asterixdb/pom.xml | 64 +++++++----------
.../algebricks/algebricks-compiler/pom.xml | 8 +--
...alFirstRuleCheckFixpointRuleControllerTest.java | 2 +-
hyracks-fullstack/hyracks/hyracks-api/pom.xml | 2 +-
.../hyracks-control/hyracks-control-cc/pom.xml | 2 +-
.../hyracks-integration-tests/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-http/pom.xml | 2 +-
.../org/apache/hyracks/test/http/HttpTestUtil.java | 16 ++---
hyracks-fullstack/hyracks/hyracks-net/pom.xml | 2 +-
.../tests/FullFrameChannelReadInterfaceTest.java | 4 +-
.../hyracks/hyracks-storage-am-btree/pom.xml | 7 +-
.../storage/am/btree/test/FramewriterTest.java | 2 +-
.../hyracks/hyracks-storage-am-common/pom.xml | 2 +-
.../hyracks/hyracks-test-support/pom.xml | 2 +-
.../hyracks-storage-am-lsm-common-test/pom.xml | 2 +-
.../lsm/common/test/ConcurrentMergePolicyTest.java | 2 +-
.../am/lsm/common/test/PrefixMergePolicyTest.java | 2 +-
hyracks-fullstack/pom.xml | 83 +++++++++++-----------
27 files changed, 136 insertions(+), 137 deletions(-)