cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Mon, 07 Nov 2016 04:29:04 GMT
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/67a2a5eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67a2a5eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67a2a5eb

Branch: refs/heads/trunk
Commit: 67a2a5eb343b3cee7e74f0f64e4833ad393159ad
Parents: 9ed4fac 91208b6
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Sun Nov 6 20:24:33 2016 -0800
Committer: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Committed: Sun Nov 6 20:26:15 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                          | 1 +
 src/java/org/apache/cassandra/dht/RangeStreamer.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/67a2a5eb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5eb2850,47c8a1d..913fdf0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,8 -97,9 +105,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:
+  * Don't tell users to turn off consistent rangemovements during rebuild. (CASSANDRA-12296)
   * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
   * Avoid deadlock due to MV lock contention (CASSANDRA-12689)
   * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)


Mime
View raw message