Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8be4a3d7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8be4a3d7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8be4a3d7 Branch: refs/heads/ACCUMULO-378 Commit: 8be4a3d7462f7ca88805c00ec7b3db49319cb5e5 Parents: 9e770ca 60b5a1c Author: Keith Turner <ktur...@apache.org> Authored: Tue Jun 3 13:07:58 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Tue Jun 3 13:07:58 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/tserver/log/DfsLogger.java | 60 +++++++++----------- 1 file changed, 28 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8be4a3d7/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java ---------------------------------------------------------------------- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java index 5093ad1,5dabedc..245ba2b --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java @@@ -51,7 -51,9 +51,8 @@@ import org.apache.accumulo.core.securit import org.apache.accumulo.core.security.crypto.DefaultCryptoModule; import org.apache.accumulo.core.security.crypto.NoFlushOutputStream; import org.apache.accumulo.core.util.Daemon; + import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.Pair; -import org.apache.accumulo.core.util.StringUtil; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.master.state.TServerInstance;
