This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 000855d4c1 Merge remote-tracking branch 'upstream/2.1' add 979617a912 Modifies log message based on PortSearch prop (#4593) new 69584e2835 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: .../org/apache/accumulo/server/rpc/TServerUtils.java | 18 ++++++++++++------ .../org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../apache/accumulo/test/functional/ZombieTServer.java | 2 +- .../apache/accumulo/test/performance/NullTserver.java | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-)