Merge branch 'cassandra-1.1' into cassandra-1.2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c00c6ab0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c00c6ab0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c00c6ab0 Branch: refs/heads/cassandra-1.2 Commit: c00c6ab098d8322e2a3a416f8416152c570c132c Parents: 8a2fdbf fab61e3 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Nov 19 21:46:39 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Nov 19 21:46:39 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/hadoop/ConfigHelper.java | 22 ++++ .../cassandra/hadoop/pig/CassandraStorage.java | 83 ++++++++++---- 3 files changed, 82 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c00c6ab0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e36bf01,a89184e..6763ba8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ -1.1.7 +1.2-rc1 + * fix cqlsh rendering of blob fields (CASSANDRA-4970) + * fix cqlsh DESCRIBE command (CASSANDRA-4913) + * save truncation position in system table (CASSANDRA-4906) + * Move CompressionMetadata off-heap (CASSANDRA-4937) + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924) + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402) + * acquire references to overlapping sstables during compaction so bloom filter + doesn't get free'd prematurely (CASSANDRA-4934) + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928) + * Separate tracing from Log4J (CASSANDRA-4861) + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905) + * Better printing of AbstractBounds for tracing (CASSANDRA-4931) + * Optimize mostRecentTomstone check in CC.collectAllData (CASSANDRA-4883) + * Change stream session ID to UUID to avoid collision from same node (CASSANDRA-4813) + * Use Stats.db when bulk loading if present (CASSANDRA-4957) + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956) + * Remove select arbitrary limit (CASSANDRA-4918) +Merged from 1.1: + * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042) * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965) * reset getRangeSlice filter after finishing a row for get_paged_slice (CASSANDRA-4919) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c00c6ab0/src/java/org/apache/cassandra/hadoop/ConfigHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c00c6ab0/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index 73e0fb5,c2f1c13..7c459b5 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@@ -22,19 -21,11 +22,12 @@@ import java.math.BigInteger import java.nio.ByteBuffer; import java.util.*; - import org.apache.cassandra.db.marshal.AbstractType; - import org.apache.cassandra.db.marshal.BytesType; - import org.apache.cassandra.db.marshal.IntegerType; - import org.apache.cassandra.db.marshal.TypeParser; +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.config.ConfigurationException; import org.apache.cassandra.db.Column; import org.apache.cassandra.db.IColumn; import org.apache.cassandra.db.marshal.*;