This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from f2d82e166a Merge branch '2.1'
     new fbf9a7cb2f Fix trivial issues preventing builds on JDK 25
     new 6d50e082fc Merge branch '2.1'

The 2 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:
 .github/workflows/maven-full-its.yaml                              | 6 +++---
 .github/workflows/maven-on-demand.yaml                             | 6 +++---
 .github/workflows/maven.yaml                                       | 7 ++++---
 .github/workflows/scripts.yaml                                     | 6 +++---
 .../core/file/blockfile/cache/lru/LruBlockCacheConfiguration.java  | 2 +-
 core/src/main/scripts/generate-thrift.sh                           | 2 ++
 .../org/apache/accumulo/core/clientImpl/thrift/ClientService.java  | 2 +-
 .../apache/accumulo/core/clientImpl/thrift/ConfigurationType.java  | 2 +-
 .../apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java  | 2 +-
 .../org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java     | 2 +-
 .../org/apache/accumulo/core/clientImpl/thrift/TInfo.java          | 2 +-
 .../accumulo/core/clientImpl/thrift/TVersionedProperties.java      | 2 +-
 .../org/apache/accumulo/core/clientImpl/thrift/TableOperation.java | 2 +-
 .../core/clientImpl/thrift/TableOperationExceptionType.java        | 2 +-
 .../clientImpl/thrift/ThriftConcurrentModificationException.java   | 2 +-
 .../core/clientImpl/thrift/ThriftNotActiveServiceException.java    | 2 +-
 .../clientImpl/thrift/ThriftResourceGroupNotExistsException.java   | 2 +-
 .../accumulo/core/clientImpl/thrift/ThriftSecurityException.java   | 2 +-
 .../core/clientImpl/thrift/ThriftTableOperationException.java      | 2 +-
 .../org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java     | 2 +-
 .../core/compaction/thrift/CompactionCoordinatorService.java       | 2 +-
 .../apache/accumulo/core/compaction/thrift/CompactorService.java   | 2 +-
 .../apache/accumulo/core/compaction/thrift/TCompactionState.java   | 2 +-
 .../accumulo/core/compaction/thrift/TCompactionStatusUpdate.java   | 2 +-
 .../accumulo/core/compaction/thrift/TExternalCompaction.java       | 2 +-
 .../accumulo/core/compaction/thrift/TExternalCompactionList.java   | 2 +-
 .../accumulo/core/compaction/thrift/TExternalCompactionMap.java    | 2 +-
 .../apache/accumulo/core/compaction/thrift/TNextCompactionJob.java | 2 +-
 .../core/compaction/thrift/UnknownCompactionIdException.java       | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/InitialScan.java      | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/IterInfo.java         | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java  | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/ScanResult.java       | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TCMResult.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TColumn.java          | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TCondition.java       | 2 +-
 .../apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java | 2 +-
 .../apache/accumulo/core/dataImpl/thrift/TConditionalSession.java  | 2 +-
 .../accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TKey.java             | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java       | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TMutation.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TRange.java           | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TRowRange.java        | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TSummaries.java       | 2 +-
 .../accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java    | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TSummary.java         | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java  | 2 +-
 .../org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java     | 2 +-
 .../org/apache/accumulo/core/gc/thrift/GCMonitorService.java       | 2 +-
 .../org/apache/accumulo/core/gc/thrift/GCStatus.java               | 2 +-
 .../org/apache/accumulo/core/gc/thrift/GcCycleStats.java           | 2 +-
 .../org/apache/accumulo/core/manager/thrift/Compacting.java        | 2 +-
 .../org/apache/accumulo/core/manager/thrift/DeadServer.java        | 2 +-
 .../org/apache/accumulo/core/manager/thrift/FateService.java       | 2 +-
 .../apache/accumulo/core/manager/thrift/ManagerClientService.java  | 2 +-
 .../org/apache/accumulo/core/manager/thrift/ManagerGoalState.java  | 2 +-
 .../apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java    | 2 +-
 .../org/apache/accumulo/core/manager/thrift/ManagerState.java      | 2 +-
 .../org/apache/accumulo/core/manager/thrift/RecoveryStatus.java    | 2 +-
 .../org/apache/accumulo/core/manager/thrift/TFateId.java           | 2 +-
 .../org/apache/accumulo/core/manager/thrift/TFateInstanceType.java | 2 +-
 .../org/apache/accumulo/core/manager/thrift/TFateOperation.java    | 2 +-
 .../apache/accumulo/core/manager/thrift/TTabletMergeability.java   | 2 +-
 .../org/apache/accumulo/core/manager/thrift/TableInfo.java         | 2 +-
 .../org/apache/accumulo/core/manager/thrift/TabletLoadState.java   | 2 +-
 .../apache/accumulo/core/manager/thrift/TabletServerStatus.java    | 2 +-
 .../org/apache/accumulo/core/manager/thrift/TabletSplit.java       | 2 +-
 .../accumulo/core/manager/thrift/ThriftPropertyException.java      | 2 +-
 .../org/apache/accumulo/core/process/thrift/MetricResponse.java    | 2 +-
 .../org/apache/accumulo/core/process/thrift/MetricSource.java      | 2 +-
 .../apache/accumulo/core/process/thrift/ServerProcessService.java  | 2 +-
 .../accumulo/core/securityImpl/thrift/TAuthenticationKey.java      | 2 +-
 .../core/securityImpl/thrift/TAuthenticationTokenIdentifier.java   | 2 +-
 .../org/apache/accumulo/core/securityImpl/thrift/TCredentials.java | 2 +-
 .../apache/accumulo/core/securityImpl/thrift/TDelegationToken.java | 2 +-
 .../accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java  | 2 +-
 .../org/apache/accumulo/core/tablet/thrift/TUnloadTabletGoal.java  | 2 +-
 .../accumulo/core/tablet/thrift/TabletManagementClientService.java | 2 +-
 .../core/tabletingest/thrift/ConstraintViolationException.java     | 2 +-
 .../org/apache/accumulo/core/tabletingest/thrift/DataFileInfo.java | 2 +-
 .../org/apache/accumulo/core/tabletingest/thrift/TDurability.java  | 2 +-
 .../core/tabletingest/thrift/TabletIngestClientService.java        | 2 +-
 .../org/apache/accumulo/core/tabletscan/thrift/ActiveScan.java     | 2 +-
 .../accumulo/core/tabletscan/thrift/ScanServerBusyException.java   | 2 +-
 .../org/apache/accumulo/core/tabletscan/thrift/ScanState.java      | 2 +-
 .../org/apache/accumulo/core/tabletscan/thrift/ScanType.java       | 2 +-
 .../core/tabletscan/thrift/TSampleNotPresentException.java         | 2 +-
 .../accumulo/core/tabletscan/thrift/TSamplerConfiguration.java     | 2 +-
 .../accumulo/core/tabletscan/thrift/TabletScanClientService.java   | 2 +-
 .../accumulo/core/tabletscan/thrift/TooManyFilesException.java     | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/ActionStats.java  | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/InputFile.java    | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/IteratorConfig.java   | 2 +-
 .../accumulo/core/tabletserver/thrift/NoSuchScanIDException.java   | 2 +-
 .../core/tabletserver/thrift/NotServingTabletException.java        | 2 +-
 .../accumulo/core/tabletserver/thrift/TCompactionGroupSummary.java | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/TCompactionKind.java  | 2 +-
 .../accumulo/core/tabletserver/thrift/TCompactionReason.java       | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/TCompactionStats.java | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/TCompactionType.java  | 2 +-
 .../accumulo/core/tabletserver/thrift/TExternalCompactionJob.java  | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java | 2 +-
 .../core/tabletserver/thrift/TabletServerClientService.java        | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/TabletStats.java  | 2 +-
 .../java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java    | 2 +-
 .../org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java   | 2 +-
 111 files changed, 121 insertions(+), 118 deletions(-)

Reply via email to