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/04/15 08:02:29 UTC
[5/5] git commit: Merge branch 'cassandra-1.2' into trunk
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/a9d6aefd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9d6aefd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9d6aefd
Branch: refs/heads/trunk
Commit: a9d6aefd4feecdc983f2a30a5b78a54b00823d65
Parents: 704eb97 1f21bbe
Author: Dave Brosius <db...@apache.org>
Authored: Mon Apr 15 02:00:37 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Mon Apr 15 02:00:37 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
.../cassandra/db/compaction/OperationType.java | 2 +-
.../cassandra/hadoop/pig/CassandraStorage.java | 8 ++++----
3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9d6aefd/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9d6aefd/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index 2b074f7,110f61d..6fa085f
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -22,13 -22,12 +22,11 @@@ import java.math.BigInteger
import java.nio.ByteBuffer;
import java.util.*;
+
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.exceptions.SyntaxException;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
-
import org.apache.cassandra.auth.IAuthenticator;
import org.apache.cassandra.db.Column;
-import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.db.marshal.AbstractCompositeType.CompositeComponent;
import org.apache.cassandra.hadoop.*;