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/3f09b79f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f09b79f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f09b79f Branch: refs/heads/trunk Commit: 3f09b79f3f7b3833c823e9efb40dabab8dad770f Parents: 1ef9738 9895c88 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Apr 17 09:17:47 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Apr 17 09:17:47 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ .../org/apache/cassandra/config/CFMetaData.java | 6 +++--- .../org/apache/cassandra/config/KSMetaData.java | 2 +- src/java/org/apache/cassandra/config/Schema.java | 8 ++++++++ src/java/org/apache/cassandra/cql/Cql.g | 2 ++ src/java/org/apache/cassandra/cql3/Cql.g | 2 ++ .../statements/CreateColumnFamilyStatement.java | 7 +++---- .../cql3/statements/CreateKeyspaceStatement.java | 9 +++------ src/java/org/apache/cassandra/db/Directories.java | 7 +++++-- 9 files changed, 32 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f09b79f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 716a5b6,f11af3d..7a985ff --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,9 +1,23 @@@ +1.1.1-dev + * optimize cleanup to drop entire sstables where possible (CASSANDRA-4079) + * optimize truncate when autosnapshot is disabled (CASSANDRA-4153) + * add support for commitlog archiving and point-in-time recovery + (CASSANDRA-3647) + * update caches to use byte[] keys to reduce memory overhead (CASSANDRA-3966) + * 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 + * Allow KS and CF names up to 48 characters (CASSANDRA-4157) + * Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156) + + + 1.1-rc1 * (Hadoop) fix wide row iteration when last row read was deleted (CASSANDRA-4154) * fix read_repair_chance to really default to 0.1 in the cli (CASSANDRA-4114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f09b79f/src/java/org/apache/cassandra/config/KSMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f09b79f/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f09b79f/src/java/org/apache/cassandra/db/Directories.java ----------------------------------------------------------------------
