cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 12 Mar 2014 15:05:08 GMT
Merge branch 'cassandra-2.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/9b123292
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b123292
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b123292

Branch: refs/heads/trunk
Commit: 9b1232929dea23a067283c6f0df2a12bb7814c77
Parents: 8873afc 9405ce0
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Mar 12 10:04:58 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Mar 12 10:04:58 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../io/compress/CompressedSequentialWriter.java | 35 ++++-----
 .../apache/cassandra/io/sstable/Descriptor.java |  3 +
 .../cassandra/io/sstable/SSTableWriter.java     | 19 +++--
 .../io/util/DataIntegrityMetadata.java          | 83 ++++++++------------
 .../cassandra/io/util/SequentialWriter.java     | 35 +++++----
 6 files changed, 79 insertions(+), 98 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b123292/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a722c6c,7a1fc60..76b1942
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,6 +1,11 @@@
 +3.0
 + * Remove CQL2 (CASSANDRA-5918)
 + * add Thrift get_multi_slice call (CASSANDRA-6757)
 +
 +
  2.1.0-beta2
+  * Switch CRC component to Adler and include it for compressed sstables 
+    (CASSANDRA-4165)
   * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
   * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
   * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)


Mime
View raw message