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/f3a86774 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f3a86774 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f3a86774 Branch: refs/heads/master Commit: f3a86774179dfc7909ff4800d535a22759ef8382 Parents: 378a9f1 9b6b9cf Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Nov 29 13:24:41 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Nov 29 13:24:41 2013 -0500 ---------------------------------------------------------------------- .../tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java | 2 -- 1 file changed, 2 deletions(-) ----------------------------------------------------------------------