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/9a7baa14 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a7baa14 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a7baa14 Branch: refs/heads/trunk Commit: 9a7baa145398aa0b1970d70ca508f4a0a6e8e01c Parents: 8ddbb74 5439d94 Author: Branimir Lambov <branimir.lam...@datastax.com> Authored: Tue Dec 6 12:17:35 2016 +0200 Committer: Branimir Lambov <branimir.lam...@datastax.com> Committed: Tue Dec 6 12:18:09 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 41 ++++++++------------ .../apache/cassandra/index/CustomIndexTest.java | 37 ++++++++++++++++++ 3 files changed, 55 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a7baa14/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 90003ec,bddd823..40407bc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -122,8 -113,9 +122,9 @@@ * 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: + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) * Nodetool should use a more sane max heap size (CASSANDRA-12739) * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a7baa14/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
