Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b921ddf2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b921ddf2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b921ddf2 Branch: refs/heads/trunk Commit: b921ddf2fc44bc446f932195c433d87ea7179983 Parents: fc3b9bf 3cb0233 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Tue Oct 25 09:57:48 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Tue Oct 25 09:57:48 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/schema/CachingParams.java | 4 +- .../org/apache/cassandra/cql3/CQLTester.java | 20 ++++-- .../apache/cassandra/cql3/KeyCacheCqlTest.java | 76 ++++++++++++++++---- 4 files changed, 81 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b921ddf2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2405f48,d1f2677..8504e0b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -95,8 -86,9 +95,9 @@@ Merged from 3.0 * Remove pre-startup check for open JMX port (CASSANDRA-12074) * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) * Restore resumable hints delivery (CASSANDRA-11960) - * Properly report LWT contention (CASSANDRA-12626) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801) * Include SSTable filename in compacting large row message (CASSANDRA-12384) * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330) * Fix ViewTest.testCompaction (CASSANDRA-12789) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b921ddf2/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------
