cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Date Fri, 13 May 2016 07:49:54 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/0c09bc85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c09bc85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c09bc85

Branch: refs/heads/trunk
Commit: 0c09bc85c841405d9e41b0831d0a15d75280597a
Parents: 3f46df5 baaf746
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Fri May 13 09:46:52 2016 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Fri May 13 09:46:52 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java        | 5 +++++
 .../cassandra/db/compaction/AbstractCompactionStrategy.java    | 5 +++++
 .../org/apache/cassandra/db/compaction/CompactionManager.java  | 2 +-
 .../cassandra/db/compaction/CompactionStrategyManager.java     | 5 +++++
 src/java/org/apache/cassandra/db/compaction/Scrubber.java      | 2 +-
 src/java/org/apache/cassandra/db/compaction/Upgrader.java      | 2 +-
 .../cassandra/db/compaction/writers/CompactionAwareWriter.java | 2 +-
 src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java  | 6 ++++++
 9 files changed, 26 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c09bc85/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bda34d2,1ea212c..a175036
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,6 +1,13 @@@
 +3.8
 + * 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)
 +
 +
  3.7
  Merged from 3.0:
+  * Allow compaction strategies to disable early open (CASSANDRA-11754)
   * Refactor Materialized View code (CASSANDRA-11475)
   * Update Java Driver (CASSANDRA-11615)
  Merged from 2.2:


Mime
View raw message