Updated Branches: refs/heads/cassandra-1.1 0ba2631ee -> 45c8f53a2 refs/heads/trunk a67a03996 -> a89c8b4d3
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/a89c8b4d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a89c8b4d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a89c8b4d Branch: refs/heads/trunk Commit: a89c8b4d335a6da6471d9f6806d8c5ab622f85cf Parents: a67a039 45c8f53 Author: Jonathan Ellis <[email protected]> Authored: Mon Jun 18 14:17:30 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jun 18 14:17:30 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../locator/AbstractNetworkTopologySnitch.java | 2 -- .../cassandra/locator/PropertyFileSnitch.java | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89c8b4d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7943112,b6702cb..c85fd92 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,6 +1,32 @@@ +1.2-dev + * update MS protocol with a version handshake + broadcast address id + (CASSANDRA-4311) + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * enforce 1m min keycache for auto (CASSANDRA-4306) + * 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) + * 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) + * fix Summary component and caches to use correct partitioner (CASSANDRA-4289) + * 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 + * Raise a meaningful exception instead of NPE when PFS encounters + an unconfigured node + no default (CASSANDRA-4349) * fix bug in sstable blacklisting with LCS (CASSANDRA-4343) * LCS no longer promotes tiny sstables out of L0 (CASSANDRA-4341) * skip tombstones during hint replay (CASSANDRA-4320) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89c8b4d/src/java/org/apache/cassandra/locator/AbstractNetworkTopologySnitch.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89c8b4d/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java ----------------------------------------------------------------------
