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 2015/04/23 18:03:25 UTC
[1/2] accumulo git commit: ACCUMULO-3643 fix ignored exception
findbugs issue
Repository: accumulo
Updated Branches:
refs/heads/1.7 f220709c1 -> 765099f26
ACCUMULO-3643 fix ignored exception findbugs issue
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f41a2539
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f41a2539
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f41a2539
Branch: refs/heads/1.7
Commit: f41a2539c29e9d4dbef657cd4ab35215d5ba3730
Parents: d3f74f7
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 12:02:22 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 12:02:22 2015 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f41a2539/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
index 8aed78a..49b4a47 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
@@ -1088,7 +1088,9 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT {
try {
client.checkIteratorConflicts(creds, TABLE_TEST, setting, EnumSet.allOf(IteratorScope.class));
fail("checkIteratorConflicts did not throw an exception");
- } catch (Exception ex) {}
+ } catch (Exception ex) {
+ System.out.println("Ignoring " + ex.toString());
+ }
client.deleteRows(creds, TABLE_TEST, null, null);
client.removeIterator(creds, TABLE_TEST, "test", EnumSet.allOf(IteratorScope.class));
String expected[][] = new String[10][];
[2/2] accumulo git commit: Merge branch '1.7' of
http://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Posted by ec...@apache.org.
Merge branch '1.7' of http://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/765099f2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/765099f2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/765099f2
Branch: refs/heads/1.7
Commit: 765099f26106d69009e1ba782b1203c5069d2103
Parents: f41a253 f220709
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 12:02:55 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 12:02:55 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/ClientConfiguration.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------