Merge branch 'cassandra-1.1' into cassandra-1.2.0 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f28e6b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f28e6b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f28e6b7 Branch: refs/heads/trunk Commit: 4f28e6b7daad6b1e4040b4dd2a8eac63e97cbdb0 Parents: c3173d4 e30519f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Nov 19 13:09:15 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Nov 19 13:09:15 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql/AlterTableStatement.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f28e6b7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7f5a487,ef5e43b..69d7dc3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ -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) +Merged from 1.1: + * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965) * reset getRangeSlice filter after finishing a row for get_paged_slice (CASSANDRA-4919) * expunge row cache post-truncate (CASSANDRA-4940) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f28e6b7/src/java/org/apache/cassandra/cql/AlterTableStatement.java ----------------------------------------------------------------------