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/f6b83ee5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6b83ee5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6b83ee5 Branch: refs/heads/master Commit: f6b83ee5074d086819bb6c1381cc20bcc970c7eb Parents: 359c210 4a5bd7e Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Oct 7 13:11:36 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Oct 7 13:11:36 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/log/SortedLogState.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
