Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecc4315c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ecc4315c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ecc4315c Branch: refs/heads/master Commit: ecc4315c88e8b9de796a498910b198491ae1b001 Parents: fa34e04 45d2110 Author: Keith Turner <ktur...@apache.org> Authored: Tue Mar 4 22:50:36 2014 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Tue Mar 4 22:50:36 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/tserver/RootFiles.java | 135 +++++++++++++++++ .../org/apache/accumulo/tserver/Tablet.java | 80 +--------- .../apache/accumulo/tserver/RootFilesTest.java | 147 +++++++++++++++++++ 3 files changed, 285 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ecc4315c/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java ----------------------------------------------------------------------
