Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/28c23e6a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/28c23e6a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/28c23e6a Branch: refs/heads/master Commit: 28c23e6aa40ccf526573e252222c30defd5698ae Parents: 2368eef 7ed250a Author: Bill Havanki <bhava...@cloudera.com> Authored: Wed Mar 12 16:54:22 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Wed Mar 12 16:54:22 2014 -0400 ---------------------------------------------------------------------- .../tserver/TabletServerResourceManager.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/28c23e6a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java ----------------------------------------------------------------------
