Updated Branches: refs/heads/cassandra-1.1 67dec69f5 -> be969899c refs/heads/trunk 602e383d6 -> 45b057bcf
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/45b057bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45b057bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45b057bc Branch: refs/heads/trunk Commit: 45b057bcf816831732d62397d53450c7fefaf11f Parents: 9688a79 be96989 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jul 3 12:01:20 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jul 3 12:01:20 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 28 +++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45b057bc/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4ce9884,7cd12a5..266fe35 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,6 +1,35 @@@ +1.2-dev + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881) + * 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) + * (cql3) always use composite types by default (CASSANDRA-4329) + + 1.1.3 + * avoid using global partitioner to estimate ranges in index sstables + (CASSANDRA-4403) * restore pre-CASSANDRA-3862 approach to removing expired tombstones from row cache during compaction (CASSANDRA-4364) * (stress) support for CQL prepared statements (CASSANDRA-3633) http://git-wip-us.apache.org/repos/asf/cassandra/blob/45b057bc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
