Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7db35194 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7db35194 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7db35194 Branch: refs/heads/master Commit: 7db3519493ae7de5123414d5f4adf81f223173d4 Parents: d798d51 42d651e Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Dec 19 17:20:16 2014 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Dec 19 17:20:16 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7db35194/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java ----------------------------------------------------------------------
