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/74f41c9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74f41c9c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74f41c9c

Branch: refs/heads/trunk
Commit: 74f41c9cc61959748aa2cb6b42186ecfd8587796
Parents: da9bb03 f294750
Author: Aleksey Yeschenko <[email protected]>
Authored: Thu May 19 16:09:23 2016 +0100
Committer: Aleksey Yeschenko <[email protected]>
Committed: Thu May 19 16:09:23 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/74f41c9c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 854ae53,4c50980..4a5dbf4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +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
+  * Don't use static dataDirectories field in Directories instances 
(CASSANDRA-11647)
  Merged from 3.0:
   * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
   * Allow compaction strategies to disable early open (CASSANDRA-11754)

Reply via email to