Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0cf5b9ca Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0cf5b9ca Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0cf5b9ca Branch: refs/heads/1.7 Commit: 0cf5b9ca07d10c43a00889e4506c7acd6f311dd1 Parents: c9f33d0 d5e26b5 Author: Josh Elser <els...@apache.org> Authored: Wed May 27 16:45:56 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 27 16:45:56 2015 -0400 ---------------------------------------------------------------------- .../apache/accumulo/tserver/TabletServer.java | 21 ++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
