You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/05 15:18:22 UTC
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
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/dbd5ce10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbd5ce10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbd5ce10
Branch: refs/heads/trunk
Commit: dbd5ce104a7e59c2cf61273212e26ed7f02dde73
Parents: fd5b1de 1d7bacc
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 15:17:44 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:17:44 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++
.../org/apache/cassandra/db/ReadCommand.java | 2 +-
.../db/compaction/CompactionIterator.java | 6 +--
.../cassandra/db/partitions/PurgeFunction.java | 12 ++---
.../apache/cassandra/db/rows/BufferCell.java | 2 +-
.../cassandra/db/compaction/TTLExpiryTest.java | 47 ++++++++++++++------
6 files changed, 49 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbd5ce10/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5ce44a3,23edbbf..b8174d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,13 @@@
-3.0.3
++3.3
++Merged from 3.0:
+ * Fix potential assertion error during compaction (CASSANDRA-10944)
++
+3.2
+ * Add requireAuthorization method to IAuthorizer (CASSANDRA-10852)
+ * Move static JVM options to conf/jvm.options file (CASSANDRA-10494)
+ * Fix CassandraVersion to accept x.y version string (CASSANDRA-10931)
+ * Add forceUserDefinedCleanup to allow more flexible cleanup (CASSANDRA-10708)
+ * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
* Fix counting of received sstables in streaming (CASSANDRA-10949)
* Implement hints compression (CASSANDRA-9428)
* Fix potential assertion error when reading static columns (CASSANDRA-10903)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbd5ce10/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------