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/4e209d9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e209d9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e209d9d Branch: refs/heads/trunk Commit: 4e209d9d33be63c9a557b032dacb42c5105e9873 Parents: dfeb8fe 2d0863c Author: Sylvain Lebresne <[email protected]> Authored: Tue Jan 12 14:18:45 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jan 12 14:18:45 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/4e209d9d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c97eae6,2a13ef6..68ea8b7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,13 @@@ +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 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)
