Merge branch 'cassandra-1.2.0' of http://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83bbd754 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83bbd754 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83bbd754 Branch: refs/heads/trunk Commit: 83bbd7542262301fd9e35471c598e0c2f7076a3b Parents: f574c95 4f28e6b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Nov 19 17:53:29 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Nov 19 17:53:29 2012 +0100 ---------------------------------------------------------------------- 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/83bbd754/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 72dd52c,69d7dc3..e36bf01 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -15,8 -15,8 +15,9 @@@ * 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: + * 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)