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/2d0863c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d0863c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d0863c6 Branch: refs/heads/trunk Commit: 2d0863c6d4192c263e8c303ba9e581b1bc5780ed Parents: 663f765 f4037f9 Author: Sylvain Lebresne <[email protected]> Authored: Tue Jan 12 14:18:30 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jan 12 14:18:30 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/rows/BTreeRow.java | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d0863c6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a650448,da5ed26..2a13ef6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,8 +1,17 @@@ -3.0.3 +3.3 +Merged from 3.0: + * Fix UnsupportedOperationException when reading old sstable with range + tombstone (CASSANDRA-10743) * MV should use the maximum timestamp of the primary key (CASSANDRA-10910) * Fix potential assertion error during compaction (CASSANDRA-10944) + +3.2 + * Make sure tokens don't exist in several data directories (CASSANDRA-6696) + * 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)
