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/a7854fdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7854fdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7854fdd Branch: refs/heads/cassandra-3.3 Commit: a7854fdd339d3322c3ad66a254925311cedb1f91 Parents: 91aeb26 e9e127a Author: Carl Yeksigian <c...@apache.org> Authored: Wed Jan 6 11:54:24 2016 -0500 Committer: Carl Yeksigian <c...@apache.org> Committed: Wed Jan 6 11:54:24 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7854fdd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 10a72c8,cf872d9..77531af --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,15 @@@ -3.0.3 +3.3 +Merged from 3.0: + * 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)
