accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ibe...@apache.org
Subject [accumulo] 01/01: Merge branch '1.8'
Date Thu, 01 Feb 2018 23:27:38 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit a0031285b052488c7ee3b5d480f6e09f96c1ffea
Merge: d90d39e 46a5bdb
Author: Ivan Bella <ivan@bella.name>
AuthorDate: Thu Feb 1 16:53:05 2018 -0500

    Merge branch '1.8'
    
    Conflicts:
    	fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java
    	server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java

 .../org/apache/accumulo/fate/zookeeper/Retry.java  | 56 ++++++++++++++++++++--
 .../accumulo/fate/zookeeper/RetryFactory.java      | 17 +++++--
 .../accumulo/fate/zookeeper/RetryFactoryTest.java  | 10 ++--
 .../apache/accumulo/fate/zookeeper/RetryTest.java  | 32 +++++++++++--
 .../org/apache/accumulo/tserver/TabletServer.java  |  5 +-
 .../accumulo/tserver/log/TabletServerLogger.java   |  5 +-
 6 files changed, 105 insertions(+), 20 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
ibella@apache.org.

Mime
View raw message