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/512a2fa2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/512a2fa2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/512a2fa2 Branch: refs/heads/trunk Commit: 512a2fa21fa77bd8780733186747529343176160 Parents: 367dfd5 1020779 Author: Sam Tunnicliffe <[email protected]> Authored: Thu Jan 14 14:14:29 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Thu Jan 14 14:14:29 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../internal/composites/CompositesSearcher.java | 2 +- test/unit/org/apache/cassandra/Util.java | 32 ++++++++++++++++++++ .../apache/cassandra/db/SecondaryIndexTest.java | 18 +++++++++++ .../org/apache/cassandra/index/StubIndex.java | 27 ++--------------- 5 files changed, 54 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/512a2fa2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b2df9f7,447b857..b59f182 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,6 +1,14 @@@ +3.4 + * Simplify row cache invalidation code (CASSANDRA-10396) + * Support user-defined compaction through nodetool (CASSANDRA-10660) + * 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: + * Ensure stale index entries are purged during reads (CASSANDRA-11013) * (cqlsh) Also apply --connect-timeout to control connection timeout (CASSANDRA-10959) * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
