You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/06/06 22:01:55 UTC
[1/2] git commit: remove bad import
Updated Branches:
refs/heads/trunk 9b0c3de85 -> 6da1cbbce
remove bad import
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd6d19bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd6d19bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd6d19bd
Branch: refs/heads/trunk
Commit: fd6d19bd5cdf764ce6667d1bd974795bb1d871fc
Parents: b973a33
Author: Dave Brosius <db...@apache.org>
Authored: Thu Jun 6 16:00:42 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu Jun 6 16:00:42 2013 -0400
----------------------------------------------------------------------
.../cassandra/thrift/TFramedTransportFactory.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd6d19bd/src/java/org/apache/cassandra/thrift/TFramedTransportFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/TFramedTransportFactory.java b/src/java/org/apache/cassandra/thrift/TFramedTransportFactory.java
index 6907900..7d2d89e 100644
--- a/src/java/org/apache/cassandra/thrift/TFramedTransportFactory.java
+++ b/src/java/org/apache/cassandra/thrift/TFramedTransportFactory.java
@@ -32,7 +32,6 @@ import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
import org.apache.hadoop.conf.Configuration;
-import sun.plugin2.message.transport.TransportFactory;
public class TFramedTransportFactory implements ITransportFactory
{
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6da1cbbc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6da1cbbc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6da1cbbc
Branch: refs/heads/trunk
Commit: 6da1cbbce740fd05c528ee1e627f7d8a89699f49
Parents: 9b0c3de fd6d19b
Author: Dave Brosius <db...@apache.org>
Authored: Thu Jun 6 16:01:24 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu Jun 6 16:01:24 2013 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------