cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Fri, 15 Sep 2017 16:26:24 GMT
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 2a93c22a3a315eceae951a86e612fbe8a0a85702
Parents: d9a2cc9 9ea6130
Author: Aleksey Yeschenko <aleksey@yeschenko.com>
Authored: Fri Sep 15 17:25:40 2017 +0100
Committer: Aleksey Yeschenko <aleksey@yeschenko.com>
Committed: Fri Sep 15 17:25:40 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                           |  1 +
 .../org/apache/cassandra/service/DataResolver.java    | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a93c22a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index eb1d154,a259545..33055e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Fix counter application order in short read protection (CASSANDRA-12872)
   * Don't block RepairJob execution on validation futures (CASSANDRA-13797)
   * Wait for all management tasks to complete before shutting down CLSM (CASSANDRA-13123)
   * INSERT statement fails when Tuple type is used as clustering column with default DESC
order (CASSANDRA-13717)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a93c22a/src/java/org/apache/cassandra/service/DataResolver.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message