cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 21 Oct 2015 13:46:34 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/1b386c5d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b386c5d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b386c5d

Branch: refs/heads/trunk
Commit: 1b386c5d5975922b7c439e5153d63e83e98fa2ec
Parents: 05eb602 1fe594d
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Oct 21 15:46:19 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Oct 21 15:46:19 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../org/apache/cassandra/db/LegacyLayout.java   |  50 --
 .../cassandra/db/UnfilteredDeserializer.java    | 468 ++++++++++++++-----
 .../columniterator/AbstractSSTableIterator.java |   4 +-
 .../columniterator/SSTableReversedIterator.java |  18 +-
 5 files changed, 361 insertions(+), 180 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b386c5d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 36b95f4,0529dd8..ac98481
--- 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
+  * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360)
   * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
  Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug


Mime
View raw message