cassandra-commits mailing list archives

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

Branch: refs/heads/trunk
Commit: c819cb8563092b67fc82322d0540e362ab993ac5
Parents: 353bfdd 0ac1079
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Oct 4 14:31:24 2016 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Oct 4 14:31:39 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../apache/cassandra/hints/HintsDispatcher.java | 29 ++++++++++++++++++--
 .../cassandra/metrics/HintsServiceMetrics.java  |  9 ++++++
 3 files changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c819cb85/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 724bdb1,20bb4ff..de2c351
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,9 @@@
 +4.0
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 +
++
  3.10
+  * Add hint delivery metrics (CASSANDRA-12693)
   * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
   * ColumnIndex does not reuse buffer (CASSANDRA-12502)
   * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)


Mime
View raw message