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/3420097e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3420097e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3420097e Branch: refs/heads/master Commit: 3420097ea29517f3dccd2377f840e0ca09e35405 Parents: bdc6c04 ec77248 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Dec 31 14:26:50 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Dec 31 14:26:50 2013 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tserver/Tablet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3420097e/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java ----------------------------------------------------------------------
