cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 16 Oct 2015 19:28:02 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dec76593
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dec76593
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dec76593

Branch: refs/heads/trunk
Commit: dec76593f9259a7b5315c7b45e7433146bba5ec1
Parents: 09c94a6 bc89bc6
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Fri Oct 16 20:24:47 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Fri Oct 16 20:24:47 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  4 +++
 .../compress/CompressedRandomAccessReader.java  | 16 +++++++-----
 .../io/sstable/format/SSTableReader.java        | 23 +++++++++++++----
 .../cassandra/io/util/IChecksummedFile.java     | 27 --------------------
 .../cassandra/io/util/ICompressedFile.java      |  2 +-
 .../apache/cassandra/io/util/SegmentedFile.java | 14 +---------
 .../cassandra/schema/CompressionParams.java     | 12 +++++++++
 .../miscellaneous/CrcCheckChanceTest.java       | 19 +++++++++++++-
 9 files changed, 64 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dec76593/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e6f5733,cb4c2d8..801b2fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Remove circular references in SegmentedFile (CASSANDRA-10543)
   * Ensure validation of indexed values only occurs once per-partition (CASSANDRA-10536)
   * Fix handling of static columns for range tombstones in thrift (CASSANDRA-10174)
   * Support empty ColumnFilter for backward compatility on empty IN (CASSANDRA-10471)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dec76593/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------


Mime
View raw message