You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2016/08/01 21:05:56 UTC
[06/10] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' 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/268922b2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/268922b2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/268922b2
Branch: refs/heads/1.7
Commit: 268922b21cb08e05f4d3268c4cbafeeefe75fee7
Parents: 5b80b2a d79776d
Author: Josh Elser <el...@apache.org>
Authored: Mon Aug 1 16:43:35 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Aug 1 16:43:35 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/test/ShellServerIT.java | 24 ++++++--------------
1 file changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/268922b2/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index ced4a6a,95066a5..b7bf85b
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@@ -717,8 -625,10 +707,8 @@@ public class ShellServerIT extends Shar
ts.exec("getauths", true, "foo", true);
ts.exec("getauths", true, "bar", true);
passed = true;
- } catch (Exception e) {
- UtilWaitThread.sleep(500);
- } catch (AssertionError e) {
+ } catch (AssertionError | Exception e) {
- UtilWaitThread.sleep(300);
+ UtilWaitThread.sleep(500);
}
}
assertTrue("Could not successfully see updated authoriations", passed);