This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch 3.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 31b43ab0b6 Fix table names in SimpleGarbageCollector caused by previous merge (#5314) add 62e09a06d0 uses consistent zk host addr in MAC (#5316) new ab70503be1 Merge remote-tracking branch 'upstream/2.1' into 3.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/miniclusterImpl/MiniAccumuloClusterImpl.java | 5 +++-- .../org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)