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/5cd47363 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cd47363 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cd47363 Branch: refs/heads/trunk Commit: 5cd473632355fc75087f936a03353cb560f58f76 Parents: 991c2a2 36a9f9b Author: Jonathan Ellis <[email protected]> Authored: Thu Apr 19 15:53:59 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Apr 19 15:53:59 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh | 2 +- build.xml | 12 +++++------- src/java/org/apache/cassandra/cql3/Cql.g | 4 +--- .../cql3/statements/AlterTableStatement.java | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cd47363/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a6178d0,5e84e66..16b2165 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,6 +1,24 @@@ +1.1.1-dev + * add -cf option to nodetool snapshot, and takeColumnFamilySnapshot to + StorageService mbean (CASSANDRA-556) + * 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) + * Expose repairing by a user provided range (CASSANDRA-3912) + + 1.1-dev + * fix NPE in cql3 ALTER TABLE (CASSANDRA-4163) + * (cqlsh) fix recognizing uppercase SELECT keyword (CASSANDRA-4161) * average a reduced liveRatio estimate with the previous one (CASSANDRA-4065) * Allow KS and CF names up to 48 characters (CASSANDRA-4157) * Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156)
