This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a change to branch no-chop-merge
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from a5ad933c97 Merge branch 'main' into no-chop-merge
add efc9c72aae Adjust expected ZK watcher count (lower) in IT (#3637)
add abd7c6c2f0 tests custom prop changes are seen (#3627)
add 2917cdf9fa Updated ClientContext to handle time duration values
correctly (#3631)
add 4c649e020f Replace ConcurrentHashMap with Caffine cache for configs
(#3599)
add 7c2ebd34ed Merge remote-tracking branch 'upstream/2.1'
add 48259029eb Increase timeouts in ManagerAssignmentIT to address CI
failures (#3643)
add dfbb05f254 Capture lock sessionId after lock acquisition for reuse
(#3638)
add db1518538d Merge remote-tracking branch 'upstream/2.1'
add 90e0b9341b Uses cached tserver session id in more places (#3647)
add edc16e5734 Adds IT that verifies scans see data written by concurrent
writers (#3639)
add c51469d74f Merge remote-tracking branch 'upstream/2.1'
add cf88820146 Merge branch 'main' into no-chop-merge
No new revisions were added by this update.
Summary of changes:
.../accumulo/core/clientImpl/ClientContext.java | 6 +-
.../core/clientImpl/ClientContextTest.java | 43 +-
.../accumulo/core/util/ConfigurationImplTest.java | 16 +
.../server/conf/ServerConfigurationFactory.java | 44 +-
.../accumulo/server/util/ManagerMetadataUtil.java | 35 +-
.../org/apache/accumulo/tserver/TabletServer.java | 12 +-
.../accumulo/tserver/UnloadTabletHandler.java | 8 +-
.../accumulo/tserver/tablet/DatafileManager.java | 2 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 4 +-
.../apache/accumulo/test/ScanConsistencyIT.java | 697 +++++++++++++++++++++
.../test/functional/ManagerAssignmentIT.java | 120 ++--
.../test/functional/WatchTheWatchCountIT.java | 12 +-
12 files changed, 850 insertions(+), 149 deletions(-)
create mode 100644
test/src/main/java/org/apache/accumulo/test/ScanConsistencyIT.java
