[accumulo-examples] branch master updated: ACCUMULO-4516: TeraSortIngest splits argumnet is ignored if less that 10 (#6)

[mwalch]

This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-examples.git


The following commit(s) were added to refs/heads/master by this push:
 new 9059622  ACCUMULO-4516: TeraSortIngest splits argumnet is ignored if 
less that 10 (#6)
9059622 is described below

commit 90596224fed5d1311ba2f117e3e73a14d9f78b5d
Author: Mark Owens <31573345+jmar...@users.noreply.github.com>
AuthorDate: Mon Oct 2 15:52:15 2017 -0400

ACCUMULO-4516: TeraSortIngest splits argumnet is ignored if less that 10 
(#6)

arguments are provided.

Modified TeraSortIngest.java to remove arg length check as a condition
for setting the number or splits.  Now check to see if the splits option
is non-zero and if so, set the number of splits.
---
 .../java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java 
b/src/main/java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java
index bd215aa..39e8928 100644
--- a/src/main/java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java
+++ b/src/main/java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java
@@ -390,7 +390,7 @@ public class TeraSortIngest extends Configured implements 
Tool {
 conf.setInt("cloudgen.maxvaluelength", opts.maxValueLength);
 conf.set("cloudgen.tablename", opts.getTableName());
 
-if (args.length > 10)
+if (opts.splits != 0)
   conf.setInt(NUMSPLITS, opts.splits);
 
 job.waitForCompletion(true);

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" '].

[accumulo] branch master updated: ACCUMULO-4703 Upgrade Jetty version

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new c286ed2  ACCUMULO-4703 Upgrade Jetty version
c286ed2 is described below

commit c286ed261705fb403f487554457942ca26b5e33f
Author: Mike Miller 
AuthorDate: Mon Oct 2 11:54:47 2017 -0400

ACCUMULO-4703 Upgrade Jetty version
---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2aada0d..0d8782d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,8 +134,7 @@
 false
 2.9.0
 2.25.1
-
-9.2.17.v20160517
+9.3.21.v20170918
 1.8
 1.8
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" '].