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/5b6dee9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b6dee9c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b6dee9c

Branch: refs/heads/trunk
Commit: 5b6dee9c5053c010c1fae9095ea200e1184e33e6
Parents: 3535ed5 1f19d1a
Author: Stefania Alborghetti <stefania.alborghe...@datastax.com>
Authored: Wed Oct 19 09:47:45 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com>
Committed: Wed Oct 19 09:47:45 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 .../org/apache/cassandra/db/lifecycle/ViewTest.java     | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b6dee9c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 95fb1d3,30caf4f..0a72c50
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -91,8 -84,9 +91,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:
+  * Fix ViewTest.testCompaction (CASSANDRA-12789)
   * Improve avg aggregate functions (CASSANDRA-12417)
   * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
   * nodetool stopdaemon errors out (CASSANDRA-12646)

Reply via email to