This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch PHOENIX-6978-feature
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 61435ae27fbd9c1b6f7a74ef9a087e7f0e48b20d
Merge: aef30eff76 6125f0244c
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Thu Sep 28 23:15:54 2023 -0700
Merge branch 'master' into PHOENIX-6978-feature
phoenix-core/pom.xml | 9 ++++----
.../phoenix/end2end/AlterTableWithViewsIT.java | 2 +-
.../phoenix/mapreduce/index/IndexScrutinyTool.java | 2 --
.../phoenix/query/ConnectionQueryServicesImpl.java | 4 +++-
.../query/ConnectionQueryServicesImplTest.java | 26 ++++++++++++++++++++--
.../java/org/apache/phoenix/pherf/PherfMainIT.java | 9 ++++----
.../org/apache/phoenix/pherf/ResultBaseTestIT.java | 4 +++-
.../org/apache/phoenix/pherf/SchemaReaderIT.java | 3 ++-
.../pherf/workload/mt/MultiTenantTestUtils.java | 9 +++++++-
.../mt/TenantTableOperationWorkloadIT.java | 6 +++++
.../workload/mt/TenantViewOperationWorkloadIT.java | 6 +++++
pom.xml | 26 +---------------------
12 files changed, 64 insertions(+), 42 deletions(-)
