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/01/24 19:28:47 UTC
[1/2] git commit: ACCUMULO-1961 eliminate warnings
Updated Branches:
refs/heads/master b2cde1917 -> bdded2cd0
ACCUMULO-1961 eliminate warnings
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/64d66e1d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/64d66e1d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/64d66e1d
Branch: refs/heads/master
Commit: 64d66e1dca281e7022ca5329f31b553ac8ebc172
Parents: 04a89fc
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 24 13:26:01 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 24 13:26:01 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/impl/OfflineScanner.java | 2 --
.../accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java | 2 --
.../accumulo/core/client/mapreduce/AccumuloInputFormatTest.java | 2 +-
.../test/java/org/apache/accumulo/fate/util/AddressUtilTest.java | 2 +-
.../java/org/apache/accumulo/test/continuous/ContinuousVerify.java | 1 -
5 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 42088ea..c60e153 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
@@ -22,12 +22,10 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.RowIterator;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
index 8bce08b..cf861ce 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
@@ -29,8 +29,6 @@ import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
import org.apache.accumulo.core.security.Credentials;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.SiteConfiguration;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.conf.Configuration;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
index cb6b2ad..165c7f7 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
@@ -401,7 +401,7 @@ public class AccumuloInputFormatTest {
@Test
public void testEmptyColumnFamily() throws IOException {
- Job job = new Job();
+ Job job = Job.getInstance();
Set<Pair<Text,Text>> cols = new HashSet<Pair<Text,Text>>();
cols.add(new Pair<Text,Text>(new Text(""), null));
cols.add(new Pair<Text,Text>(new Text("foo"), new Text("bar")));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
index 7d43381..6e6a3c3 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
@@ -86,7 +86,7 @@ public class AddressUtilTest extends TestCase {
}
try {
log.info("AddressUtil is (hopefully) going to spit out an error about DNS lookups. you can ignore it.");
- int result = AddressUtil.getAddressCacheNegativeTtl(null);
+ AddressUtil.getAddressCacheNegativeTtl(null);
fail("The JVM Security settings cache DNS failures forever, this should cause an exception.");
} catch(IllegalArgumentException exception) {
assertTrue(true);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index 5a4917c..8b3e570 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.test.continuous;
import java.io.IOException;
import java.lang.reflect.Method;
-import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
[2/2] 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/bdded2cd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdded2cd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdded2cd
Branch: refs/heads/master
Commit: bdded2cd0204124d6d3ae1d69353718ee39ec12e
Parents: b2cde19 64d66e1
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 24 13:26:12 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 24 13:26:12 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/impl/OfflineScanner.java | 2 --
.../accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java | 2 --
.../accumulo/core/client/mapreduce/AccumuloInputFormatTest.java | 2 +-
.../test/java/org/apache/accumulo/fate/util/AddressUtilTest.java | 2 +-
.../java/org/apache/accumulo/test/continuous/ContinuousVerify.java | 1 -
5 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------