Updated Branches: refs/heads/cassandra-1.1 80d7d43e2 -> 98dc41393 refs/heads/trunk 9c5630112 -> 681e2dea7
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/681e2dea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/681e2dea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/681e2dea Branch: refs/heads/trunk Commit: 681e2dea7679e0008cf149afc2b01f4b150d006c Parents: 9c56301 98dc413 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jun 26 19:51:36 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jun 26 19:51:36 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 +- .../org/apache/cassandra/tools/SSTableExport.java | 36 +++++++++------ .../apache/cassandra/tools/SSTableExportTest.java | 2 +- 3 files changed, 25 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/681e2dea/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fd530d8,1d9f20b..dbc90b9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,32 -1,5 +1,33 @@@ +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) + * 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 + * Check schema before trying to export sstable (CASSANDRA-2760) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/681e2dea/src/java/org/apache/cassandra/tools/SSTableExport.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/681e2dea/test/unit/org/apache/cassandra/tools/SSTableExportTest.java ----------------------------------------------------------------------
