You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by mm...@apache.org on 2017/09/25 16:26:31 UTC

[accumulo] 02/04: Merge branch '1.7' into 1.8

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit dea1937f995bc924402a6164b32f8acc56bb8e07
Merge: 8a966a0 b25f679
Author: Mike Miller <mm...@apache.org>
AuthorDate: Thu Sep 14 15:33:36 2017 -0400

    Merge branch '1.7' into 1.8

 .../core/file/rfile/VisMetricsGatherer.java        | 20 ++++++++++-------
 .../java/org/apache/accumulo/fate/ZooStore.java    |  2 +-
 .../apache/accumulo/fate/util/UtilWaitThread.java  | 26 ++++++++++++++++++++++
 .../accumulo/minicluster/MiniAccumuloRunner.java   |  7 +++---
 .../main/java/org/apache/accumulo/proxy/Proxy.java |  4 ++--
 5 files changed, 45 insertions(+), 14 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <co...@accumulo.apache.org>.