Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3b4ef02b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3b4ef02b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3b4ef02b Branch: refs/heads/master Commit: 3b4ef02b2aca6adf2f338b3d46ab9ba6c0d9ec65 Parents: 25af3a3 af21ac5 Author: Josh Elser <els...@apache.org> Authored: Tue Dec 22 16:48:04 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Dec 22 16:48:04 2015 -0500 ---------------------------------------------------------------------- .../apache/accumulo/tserver/TabletServerResourceManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3b4ef02b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java ----------------------------------------------------------------------
