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

Posted to commits@accumulo.apache.org by kt...@apache.org on 2019/01/02 22:05:29 UTC

[accumulo] 02/02: Merge branch 'master' of github.com:apache/accumulo

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

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

commit c22ca4a86f06dab5b2081053560854c0b1bf08e2
Merge: c0f9e32 6539df6
Author: Keith Turner <kt...@apache.org>
AuthorDate: Wed Jan 2 17:02:00 2019 -0500

    Merge branch 'master' of github.com:apache/accumulo

 .../core/clientImpl/ReplicationClient.java         | 13 +----
 .../org/apache/accumulo/tserver/InMemoryMap.java   | 55 --------------------
 .../org/apache/accumulo/tserver/NativeMap.java     |  6 ---
 .../org/apache/accumulo/tserver/TabletServer.java  | 10 +---
 .../tserver/TabletServerResourceManager.java       | 26 ----------
 .../tserver/compaction/MajorCompactionRequest.java |  2 +
 .../TooManyDeletesCompactionStrategy.java          |  4 --
 .../accumulo/tserver/tablet/CommitSession.java     |  4 +-
 .../accumulo/tserver/tablet/ScanOptions.java       |  8 ---
 .../org/apache/accumulo/tserver/tablet/Tablet.java | 16 +-----
 .../accumulo/tserver/tablet/TabletCommitter.java   | 60 ----------------------
 .../apache/accumulo/tserver/tablet/TabletData.java |  4 --
 .../accumulo/tserver/tablet/TabletMemory.java      | 10 +---
 13 files changed, 8 insertions(+), 210 deletions(-)