This is an automated email from the ASF dual-hosted git repository. vjasani pushed a change to branch PHOENIX-6978-feature in repository https://gitbox.apache.org/repos/asf/phoenix.git
from 86ba545834 Merge branch 'master' into PHOENIX-6978-feature add fd485ab4f3 PHOENIX-7027 Add compatibility module for Hbase 2.5.4 and upgrade Hbase version to 2.5.5 add 8a59bad257 PHOENIX-7042 Update Jetty to 9.4.52.v20230823 add d6278a0f70 PHOENIX-6900 Enable paging feature when the phoenix query is made on a table snapshot. (#1673) new a2664420d2 Merge branch 'master' into PHOENIX-6978-feature The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: phoenix-assembly/pom.xml | 5 +++ phoenix-core/pom.xml | 3 ++ .../IndexHalfStoreFileReaderGenerator.java | 8 ++-- .../iterate/TableSnapshotResultIterator.java | 2 + .../java/org/apache/phoenix/util/ScanUtil.java | 12 ++++-- .../apache/phoenix/compat/hbase/CompatUtil.java | 7 +++- .../apache/phoenix/compat/hbase/CompatUtil.java | 7 +++- .../apache/phoenix/compat/hbase/CompatUtil.java | 7 +++- .../pom.xml | 8 ++-- .../phoenix/compat/hbase/CompatDelegateHTable.java | 0 .../compat/hbase/CompatOmidTransactionTable.java | 0 .../compat/hbase/CompatPhoenixRpcScheduler.java | 0 .../apache/phoenix/compat/hbase/CompatUtil.java | 7 +++- .../compat/hbase/HbaseCompatCapabilities.java | 0 .../hbase/ReplicationSinkCompatEndpoint.java | 0 pom.xml | 44 +++++++++++++++++++--- 16 files changed, 85 insertions(+), 25 deletions(-) copy {phoenix-hbase-compat-2.5.0 => phoenix-hbase-compat-2.5.4}/pom.xml (94%) copy {phoenix-hbase-compat-2.5.0 => phoenix-hbase-compat-2.5.4}/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java (100%) copy {phoenix-hbase-compat-2.5.0 => phoenix-hbase-compat-2.5.4}/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java (100%) copy {phoenix-hbase-compat-2.5.0 => phoenix-hbase-compat-2.5.4}/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java (100%) copy {phoenix-hbase-compat-2.5.0 => phoenix-hbase-compat-2.5.4}/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java (91%) copy {phoenix-hbase-compat-2.3.0 => phoenix-hbase-compat-2.5.4}/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java (100%) copy {phoenix-hbase-compat-2.4.1 => phoenix-hbase-compat-2.5.4}/src/main/java/org/apache/phoenix/compat/hbase/ReplicationSinkCompatEndpoint.java (100%)