You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2014/11/12 18:49:38 UTC
[1/2] cassandra git commit: Fix regression in HadoopCompat from
CASSANDRA-7579
Repository: cassandra
Updated Branches:
refs/heads/trunk 611d1baec -> cf94e3c31
Fix regression in HadoopCompat from CASSANDRA-7579
Patch by jmckenzie; reviewed by bwilliams for CASSANDRA-8292
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/deff175a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/deff175a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/deff175a
Branch: refs/heads/trunk
Commit: deff175a4e8f65fc6e09dc96e07a4d3fd16d8090
Parents: c80d2d3
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Nov 12 11:45:46 2014 -0600
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Nov 12 11:45:46 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/HadoopCompat.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/deff175a/src/java/org/apache/cassandra/hadoop/HadoopCompat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/HadoopCompat.java b/src/java/org/apache/cassandra/hadoop/HadoopCompat.java
index bfc4ff6..f2f7033 100644
--- a/src/java/org/apache/cassandra/hadoop/HadoopCompat.java
+++ b/src/java/org/apache/cassandra/hadoop/HadoopCompat.java
@@ -36,7 +36,6 @@ import org.apache.hadoop.mapreduce.StatusReporter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.TaskInputOutputContext;
-import org.apache.cassandra.utils.JVMStabilityInspector;
/*
* This is based on ContextFactory.java from hadoop-2.0.x sources.
@@ -132,7 +131,6 @@ public class HadoopCompat {
get_counter = Class.forName(PACKAGE + ".TaskAttemptContext").getMethod("getCounter", String.class,
String.class);
} catch (Exception e) {
- JVMStabilityInspector.inspectThrowable(e);
get_counter = Class.forName(PACKAGE + ".TaskInputOutputContext").getMethod("getCounter",
String.class, String.class);
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jm...@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/cf94e3c3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf94e3c3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf94e3c3
Branch: refs/heads/trunk
Commit: cf94e3c318c98c7f5fa5bfdc03b8c86d1bc464b2
Parents: 611d1ba deff175
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Nov 12 11:48:45 2014 -0600
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Nov 12 11:48:45 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/HadoopCompat.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------