cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 11 Dec 2015 16:45:19 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3f79c5baae355924866b4997b18960b6590f5763
Parents: 2cd18ef 65885e7
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Fri Dec 11 17:43:02 2015 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Fri Dec 11 17:43:02 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 .../cassandra/db/compaction/CompactionInfo.java |  14 +-
 .../db/compaction/CompactionManager.java        |  15 +
 .../cassandra/db/compaction/OperationType.java  |   3 +-
 .../io/sstable/IndexSummaryManager.java         | 279 +--------------
 .../io/sstable/IndexSummaryRedistribution.java  | 349 +++++++++++++++++++
 .../io/sstable/IndexSummaryManagerTest.java     |  80 ++++-
 7 files changed, 461 insertions(+), 281 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f79c5ba/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 296d3cd,5932dbb..fad4bb2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,7 +1,25 @@@
 -3.0.2
 +3.2
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
+ Merged from 2.1:
+  * Allow cancellation of index summary redistribution (CASSANDRA-8805)
 -3.0.1
 +
 +
 +3.1
 +Merged from 3.0:
   * Avoid MV race during node decommission (CASSANDRA-10674)
   * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
   * Handle single-column deletions correction in materialized views

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f79c5ba/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------


Mime
View raw message