Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/837d0d04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/837d0d04 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/837d0d04 Branch: refs/heads/trunk Commit: 837d0d0457eb5ceec25c7dc628eead79f9be5927 Parents: 4e209d9 2318f76 Author: Sylvain Lebresne <[email protected]> Authored: Tue Jan 12 16:52:00 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jan 12 16:52:00 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Lists.java | 2 +- .../cql3/validation/entities/CollectionsTest.java | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/837d0d04/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 68ea8b7,50dc106..41d06cc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,6 +1,12 @@@ +3.4 + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981) + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953) + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838) + + 3.3 Merged from 3.0: + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954) * Fix UnsupportedOperationException when reading old sstable with range tombstone (CASSANDRA-10743) * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
