Updated Branches: refs/heads/cassandra-1.1 54c647ffe -> 8a3bb80e0 refs/heads/trunk 2bfea99dd -> 33c7273cb
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33c7273c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33c7273c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33c7273c Branch: refs/heads/trunk Commit: 33c7273cb8d44ec4f3b3f7a9f357f531946bd96b Parents: 2bfea99 8a3bb80 Author: Jonathan Ellis <[email protected]> Authored: Wed Jun 27 11:40:13 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jun 27 11:40:13 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/cql3/statements/SelectStatement.java | 8 +++----- .../cassandra/db/compaction/CompactionManager.java | 8 +++++--- 3 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33c7273c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c2fecb2,8918dee..8af4eeb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,5 +1,32 @@@ +1.2-dev + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) + * split up rpc timeout by operation type (CASSANDRA-2819) + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762) + * update MS protocol with a version handshake + broadcast address id + (CASSANDRA-4311) + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * remove COPP (CASSANDRA-2479) + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442) + * update MurmurHash to version 3 (CASSANDRA-2975) + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060) + * (CLI) jline version is bumped to 1.0 to properly support + 'delete' key function (CASSANDRA-4132) + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 4289) + * Add support for range tombstones (CASSANDRA-3708) + * Improve MessagingService efficiency (CASSANDRA-3617) + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794) + * Set thrift HSHA server thread limit to unlimited by default (CASSANDRA-4277) + * Avoids double serialization of CF id in RowMutation messages + (CASSANDRA-4293) + * stream compressed sstables directly with java nio (CASSANDRA-4297) + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885) + * Add column metadata to system column families (CASSANDRA-4018) + + 1.1.2 + * Fix cleanup not deleting index entries (CASSANDRA-4379) * Use correct partitioner when saving + loading caches (CASSANDRA-4331) * Check schema before trying to export sstable (CASSANDRA-2760) * Raise a meaningful exception instead of NPE when PFS encounters http://git-wip-us.apache.org/repos/asf/cassandra/blob/33c7273c/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33c7273c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
