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 cf88820146 Merge branch 'main' into no-chop-merge add 5adc92bce1 Replace semaphore with ReentrantLock in Scanner to help clean up scan sessions (#3644) add dd6d60a507 make option exclude-parent-properties, other minor clean-up (#3659) add e4df612062 adds an open ended scan to ScanConsistencyIT (#3656) add 4ec6dd2054 Merge remote-tracking branch 'upstream/2.1' new 15610b2e97 Merge branch 'main' into no-chop-merge 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: .../apache/accumulo/tserver/tablet/Scanner.java | 57 ++++++++++++++++------ .../shell/commands/CreateNamespaceCommand.java | 6 +-- .../shell/commands/CreateTableCommand.java | 6 +-- .../apache/accumulo/test/ScanConsistencyIT.java | 49 +++++++++++++------ .../test/shell/ShellCreateNamespaceIT.java | 4 +- .../accumulo/test/shell/ShellCreateTableIT.java | 3 +- 6 files changed, 84 insertions(+), 41 deletions(-)