cassandra-commits mailing list archives

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

Branch: refs/heads/trunk
Commit: 13a46f073f3b9ba7ab4f8cfd010601619444f33a
Parents: 700a1dc 9fd0d07
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Wed Oct 5 09:37:14 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Wed Oct 5 09:37:14 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/service/StorageService.java       | 59 ++++++++++++++++++++
 2 files changed, 60 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/13a46f07/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8d83c02,d86a36c..4d8184f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +4.0
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 +
 +
  3.10
+  * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
   * Add hint delivery metrics (CASSANDRA-12693)
   * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
   * ColumnIndex does not reuse buffer (CASSANDRA-12502)


Mime
View raw message