This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 62cd737399 Merge branch '2.1' add dd40162b19 acquires two locks in correct order in tablet close (#4751) add bb9a967f56 Cleans up non-existent migrating metadata tablets in manager (#4750) new f210f860d7 Merge branch '2.1' 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: .../java/org/apache/accumulo/manager/Manager.java | 83 ++++++++------- .../accumulo/tserver/tablet/DatafileManager.java | 6 +- .../org/apache/accumulo/tserver/tablet/Tablet.java | 111 ++++++++++++--------- 3 files changed, 112 insertions(+), 88 deletions(-)