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/6ef85f9c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6ef85f9c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6ef85f9c Branch: refs/heads/master Commit: 6ef85f9c5dc074e3e0b7ea6568aaaa51dd2dfefd Parents: 4bb28fa 1b49f44 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Thu Aug 7 11:18:23 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Thu Aug 7 11:18:23 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/tserver/TabletServer.java | 2 +- .../org/apache/accumulo/test/Accumulo3010.java | 91 ++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6ef85f9c/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ----------------------------------------------------------------------
