cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Mon, 18 Sep 2017 07:00:10 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/25566768
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25566768
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25566768

Branch: refs/heads/trunk
Commit: 2556676876e94a398b4dd3f46b3e77bd0d38f73d
Parents: f9e7c2b bb3b332
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Sep 18 08:55:21 2017 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Sep 18 08:55:21 2017 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25566768/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e09708d,84ef845..54117df
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.15
 +3.11.1
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is a single leaf
and overflow collisions (CASSANDRA-13869)
 + * 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:
+  * Make isBuilt volatile in PartitionUpdate (CASSANDRA-13619)
   * Prevent integer overflow of timestamps in CellTest and RowsTest (CASSANDRA-13866)
   * Fix counter application order in short read protection (CASSANDRA-12872)
   * Don't block RepairJob execution on validation futures (CASSANDRA-13797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/25566768/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
----------------------------------------------------------------------


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


Mime
View raw message