cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Sat, 03 Dec 2016 06:38:22 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/adbb7ec4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adbb7ec4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adbb7ec4

Branch: refs/heads/trunk
Commit: adbb7ec4d5ac1b6c6d3854795ab4bb972e39f1fa
Parents: 04687c3 49ac804
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Fri Dec 2 22:35:34 2016 -0800
Committer: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Committed: Fri Dec 2 22:35:57 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt  | 1 +
 bin/nodetool | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/adbb7ec4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3ef0e50,5cc0ebc..d917570
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -121,8 -112,9 +121,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:
+  * Nodetool should use a more sane max heap size (CASSANDRA-12739)
   * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
   * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
   * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)


Mime
View raw message