Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a504f40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a504f40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a504f40 Branch: refs/heads/cassandra-3.11 Commit: 6a504f40305bea990187d8d1fec2dbb093ddf7a2 Parents: 6b7302b 74fdfe0 Author: Sylvain Lebresne <[email protected]> Authored: Thu Feb 9 10:27:00 2017 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Feb 9 10:27:00 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/LegacyLayout.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a504f40/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e346722,1f638da..eb10bad --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,8 +1,14 @@@ -3.0.11 +3.11.0 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) +Merged from 3.0: + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) - * Abort or retry on failed hints delivery (CASSANDRA-13124) * Fix handling of partition with partition-level deletion plus live rows in sstabledump (CASSANDRA-13177) * Provide user workaround when system_schema.columns does not contain entries http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a504f40/src/java/org/apache/cassandra/db/LegacyLayout.java ----------------------------------------------------------------------
