cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Tue, 13 Dec 2016 18:36:49 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/cd5aacc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd5aacc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd5aacc8

Branch: refs/heads/trunk
Commit: cd5aacc83bc3ee2b412c191a8ce711b0401bf55a
Parents: d596a47 ddefb1d
Author: Carl Yeksigian <carl@apache.org>
Authored: Tue Dec 13 12:29:18 2016 -0500
Committer: Carl Yeksigian <carl@apache.org>
Committed: Tue Dec 13 12:29:18 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/service/StorageService.java       | 24 ++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd5aacc8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1f18fd9,14ee562..83b9082
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -133,8 -123,9 +133,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:
+  * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
   * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
   * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
   * Thread local pools never cleaned up (CASSANDRA-13033)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd5aacc8/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message