cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [7/7] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 21 Aug 2015 09:18:27 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/1e951c98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e951c98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e951c98

Branch: refs/heads/trunk
Commit: 1e951c983197c696b9c456406125e8f7b5843a6b
Parents: 0fd857b 1c27abf
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Fri Aug 21 09:58:35 2015 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Fri Aug 21 09:58:35 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/cache/AutoSavingCache.java | 29 +++++++-------
 .../cassandra/db/PartitionRangeReadCommand.java | 13 ++++---
 .../cassandra/db/RangeSliceVerbHandler.java     |  2 +-
 .../org/apache/cassandra/db/ReadCommand.java    | 40 +++++++++++++++-----
 .../org/apache/cassandra/db/ReadResponse.java   | 30 +++++++++++++++
 .../db/SinglePartitionReadCommand.java          |  4 +-
 .../cassandra/io/util/SequentialWriter.java     | 12 +++++-
 .../apache/cassandra/net/MessagingService.java  |  6 +--
 .../utils/concurrent/Transactional.java         |  7 +++-
 .../cassandra/io/util/DataOutputTest.java       |  3 +-
 .../cassandra/io/util/SequentialWriterTest.java | 24 ++++++++++++
 12 files changed, 131 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e951c98/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e6093ad,47fea8b..d03b430
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-beta1
+  * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125)
   * Rewrite hinted handoff (CASSANDRA-6230)
   * Fix query on static compact tables (CASSANDRA-10093)
   * Fix race during construction of commit log (CASSANDRA-10049)


Mime
View raw message