cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3
Date Tue, 02 Feb 2016 13:23:27 GMT
Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/trunk
Commit: 8996b64e43a3a89dd0648f584298e2e65383b0c3
Parents: a7125d2 df3d0b0
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Feb 2 14:22:59 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Feb 2 14:22:59 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                   | 1 +
 .../cassandra/io/sstable/metadata/MetadataCollector.java      | 7 ++-----
 .../org/apache/cassandra/db/compaction/TTLExpiryTest.java     | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8996b64e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2600d56,3423927..c0acd3d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -3.0.3
 +3.3
 + * Avoid infinite loop if owned range is smaller than number of
 +   data dirs (CASSANDRA-11034)
 + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
 +Merged from 3.0:
+  * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
   * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
   * Mutations do not block for completion under view lock contention (CASSANDRA-10779)
   * Invalidate legacy schema tables when unloading them (CASSANDRA-11071)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8996b64e/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------


Mime
View raw message