You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/03/25 18:02:12 UTC

[1/4] git commit: ACCUMULO-2494 add commons-math to 1.5

Repository: accumulo
Updated Branches:
  refs/heads/master b40ce8e58 -> 4eb5237e2


ACCUMULO-2494 add commons-math to 1.5


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00355d0e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00355d0e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/00355d0e

Branch: refs/heads/master
Commit: 00355d0e02f3877558d9668bb75db6d703e860ef
Parents: ba48f03
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Mar 25 10:56:25 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Mar 25 11:02:07 2014 -0400

----------------------------------------------------------------------
 core/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/00355d0e/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6e3d917..39de12a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -51,6 +51,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
+      <artifactId>commons-math</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
       <artifactId>commons-vfs2</artifactId>
     </dependency>
     <dependency>


[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by ec...@apache.org.
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/4eb5237e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4eb5237e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4eb5237e

Branch: refs/heads/master
Commit: 4eb5237e27b655d41e7e513751341671955dc034
Parents: b40ce8e d77fd6f
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Mar 25 13:01:54 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Mar 25 13:01:54 2014 -0400

----------------------------------------------------------------------
 .../test/java/org/apache/accumulo/test/functional/LargeRowIT.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------



[2/4] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by ec...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 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/76b3fd04
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/76b3fd04
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/76b3fd04

Branch: refs/heads/master
Commit: 76b3fd0499cffc2e40e7b8b2059ed64ad0c701f1
Parents: fd99e24 00355d0
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Mar 25 11:02:56 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Mar 25 11:02:56 2014 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------



[3/4] git commit: ACCUMULO-2547 run the tservers with more memory

Posted by ec...@apache.org.
ACCUMULO-2547 run the tservers with more memory


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d77fd6fd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d77fd6fd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d77fd6fd

Branch: refs/heads/master
Commit: d77fd6fd29d2c769991b44b6f98be14b108169aa
Parents: 76b3fd0
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Mar 25 13:00:08 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Mar 25 13:00:22 2014 -0400

----------------------------------------------------------------------
 .../test/java/org/apache/accumulo/test/functional/LargeRowIT.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d77fd6fd/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
index 2f3ce04..31783c4 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
@@ -33,6 +33,8 @@ import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.minicluster.MemoryUnit;
+import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.test.TestIngest;
 import org.apache.hadoop.conf.Configuration;
@@ -44,6 +46,7 @@ public class LargeRowIT extends ConfigurableMacIT {
   
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
+    cfg.setMemory(ServerType.TABLET_SERVER, cfg.getMemory(ServerType.TABLET_SERVER) * 2, MemoryUnit.BYTE);
     cfg.setSiteConfig(Collections.singletonMap(Property.TSERV_MAJC_DELAY.getKey(), "10ms"));
   }