You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2014/09/14 14:51:24 UTC
[1/3] git commit: ninja fix rethrow InterruptedException in
cassandra-stress Timing.snap
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 eea042b0b -> a6678a273
refs/heads/trunk 14b1c9607 -> 58985409c
ninja fix rethrow InterruptedException in cassandra-stress Timing.snap
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6678a27
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6678a27
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6678a27
Branch: refs/heads/cassandra-2.1
Commit: a6678a273d61b4db54e0b7afeeab8b1b0f7d82a1
Parents: eea042b
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sun Sep 14 13:50:38 2014 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Sep 14 13:50:38 2014 +0100
----------------------------------------------------------------------
tools/stress/src/org/apache/cassandra/stress/util/Timing.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6678a27/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/util/Timing.java b/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
index f64a40b..9a5fa56 100644
--- a/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
@@ -73,6 +73,8 @@ public class Timing
}
catch (Exception e)
{
+ if (e instanceof InterruptedException)
+ throw (InterruptedException) e;
throw new RuntimeException(e);
}
[2/3] git commit: ninja fix rethrow InterruptedException in
cassandra-stress Timing.snap
Posted by be...@apache.org.
ninja fix rethrow InterruptedException in cassandra-stress Timing.snap
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6678a27
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6678a27
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6678a27
Branch: refs/heads/trunk
Commit: a6678a273d61b4db54e0b7afeeab8b1b0f7d82a1
Parents: eea042b
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sun Sep 14 13:50:38 2014 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Sep 14 13:50:38 2014 +0100
----------------------------------------------------------------------
tools/stress/src/org/apache/cassandra/stress/util/Timing.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6678a27/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/util/Timing.java b/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
index f64a40b..9a5fa56 100644
--- a/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
@@ -73,6 +73,8 @@ public class Timing
}
catch (Exception e)
{
+ if (e instanceof InterruptedException)
+ throw (InterruptedException) e;
throw new RuntimeException(e);
}
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58985409
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58985409
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58985409
Branch: refs/heads/trunk
Commit: 58985409c9e7883bd1362687413771dcbc90ccf7
Parents: 14b1c96 a6678a2
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sun Sep 14 13:51:08 2014 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sun Sep 14 13:51:08 2014 +0100
----------------------------------------------------------------------
tools/stress/src/org/apache/cassandra/stress/util/Timing.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------