Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a8e978e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a8e978e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a8e978e Branch: refs/heads/trunk Commit: 0a8e978e799482f0c6d946dc054cb76e9539fe44 Parents: 030d471 2b77ef6 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 4 12:06:25 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 4 12:06:25 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + interface/cassandra.thrift | 4 ++-- .../org/apache/cassandra/thrift/Cassandra.java | 4 ++++ .../org/apache/cassandra/thrift/CfDef.java | 6 ++---- .../org/apache/cassandra/thrift/Constants.java | 2 +- .../org/apache/cassandra/config/CFMetaData.java | 3 ++- 6 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a8e978e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index de0c72b,9a428a5..6fd478a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ +1.1.1-dev + * add column limit to cli (CASSANDRA-3012, 4098) + * clean up and optimize DataOutputBuffer, used by CQL compression and + CompositeType (CASSANDRA-4072) + * optimize commitlog checksumming (CASSANDRA-3610) + * identify and blacklist corrupted SSTables from future compactions + (CASSANDRA-2261) + * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037) + 1.1-dev + * fix read_repair_chance to really default to 0.1 in the cli (CASSANDRA-4114) * Adds caching and bloomFilterFpChange to CQL options (CASSANDRA-4042) * Adds posibility to autoconfigure size of the KeyCache (CASSANDRA-4087) * fix KEYS index from skipping results (CASSANDRA-3996) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a8e978e/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
