Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6243e6ee
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6243e6ee
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6243e6ee
Branch: refs/heads/master
Commit: 6243e6ee0027abd775d4c82692f7787b1b537c2b
Parents: 00d8391 2fa41d0
Author: Josh Elser <els...@apache.org>
Authored: Thu Jul 2 15:47:48 2015 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Thu Jul 2 15:47:48 2015 -0400
----------------------------------------------------------------------
.../tabletserver/LargestFirstMemoryManager.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6243e6ee/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --cc
server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index a39c8b6,260685e..865e775
---
a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@@ -22,14 -22,12 +22,15 @@@ import java.util.List
import java.util.Map.Entry;
import java.util.TreeMap;
+import org.apache.accumulo.core.client.Instance;
+ import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The LargestFirstMemoryManager attempts to keep memory between 80% and 90%
full. It adapts over time the point at which it should start a compaction based
on
