Merge branch '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/0d7312e3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0d7312e3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0d7312e3 Branch: refs/heads/master Commit: 0d7312e3273c8de6fcc08503080a7fab0588557f Parents: ba9bfa9 420d7db Author: Josh Elser <els...@apache.org> Authored: Mon Jan 20 12:25:03 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Jan 20 12:25:03 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/file/FileUtil.java | 436 ------------------- .../security/crypto/BlockedOutputStream.java | 2 +- .../chapters/administration.tex | 6 +- .../accumulo_user_manual/chapters/design.tex | 11 +- .../org/apache/accumulo/server/fs/FileRef.java | 34 +- .../apache/accumulo/server/util/FileUtil.java | 46 +- .../apache/accumulo/server/fs/FileRefTest.java | 104 +++++ .../org/apache/accumulo/tserver/Tablet.java | 10 +- .../tserver/TabletIteratorEnvironment.java | 2 +- .../apache/accumulo/tserver/log/DfsLogger.java | 2 +- .../accumulo/tserver/log/SortedLogRecovery.java | 15 +- .../DefaultCompactionStrategyTest.java | 5 +- .../SizeLimitCompactionStrategyTest.java | 2 +- .../tserver/log/SortedLogRecoveryTest.java | 98 ++++- .../java/org/apache/accumulo/test/VolumeIT.java | 113 +++++ 15 files changed, 381 insertions(+), 505 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0d7312e3/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java ----------------------------------------------------------------------
