Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d81b8db3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d81b8db3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d81b8db3 Branch: refs/heads/1.5.2-SNAPSHOT Commit: d81b8db30f6a3688126bc23b3eef8de9451b3d77 Parents: f99b565 b304ed7 Author: Josh Elser <els...@apache.org> Authored: Thu Jun 19 13:30:49 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 19 13:30:49 2014 -0700 ---------------------------------------------------------------------- .../tabletserver/LargestFirstMemoryManager.java | 171 +++++++++++-------- .../accumulo/test/stress/random/Stream.java | 1 - 2 files changed, 103 insertions(+), 69 deletions(-) ----------------------------------------------------------------------
