cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Date Thu, 19 May 2016 15:00:26 GMT
Merge branch 'cassandra-3.7' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da9bb030
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da9bb030
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da9bb030

Branch: refs/heads/trunk
Commit: da9bb03067e8f11c933e1a04dccf13a1f5a131c7
Parents: beb6464 b1cf0fe
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu May 19 15:58:01 2016 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu May 19 15:58:01 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java |  6 ++++++
 src/java/org/apache/cassandra/db/Directories.java       | 10 ++++++++--
 src/java/org/apache/cassandra/db/Keyspace.java          |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/da9bb030/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index adadefd,f96c31a..854ae53
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
 +3.8
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425)
 +
 +
  3.7
  Merged from 3.0:
+  * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
   * Allow compaction strategies to disable early open (CASSANDRA-11754)
   * Refactor Materialized View code (CASSANDRA-11475)
   * Update Java Driver (CASSANDRA-11615)


Mime
View raw message