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/978e6210 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/978e6210 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/978e6210 Branch: refs/heads/master Commit: 978e6210e5acbb27d89b64c35cbc58f57873ca1d Parents: 618003d ba300ba Author: Josh Elser <els...@apache.org> Authored: Thu Jul 2 16:07:31 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jul 2 16:07:31 2015 -0400 ---------------------------------------------------------------------- .../tabletserver/LargestFirstMemoryManager.java | 24 ++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/978e6210/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java ----------------------------------------------------------------------