cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Date Tue, 31 May 2016 13:01:17 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/8c2da233
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c2da233
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c2da233

Branch: refs/heads/trunk
Commit: 8c2da233db78a930ae1e16b3a771aa253553904d
Parents: a47e469 a2b73a5
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Tue May 31 14:58:21 2016 +0200
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Tue May 31 14:58:21 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/config/DatabaseDescriptor.java    |  5 ++++
 .../apache/cassandra/db/ClusteringPrefix.java   |  6 ++--
 .../db/SinglePartitionReadCommand.java          |  2 +-
 .../cassandra/db/marshal/AbstractType.java      | 30 ++++----------------
 src/java/org/apache/cassandra/db/rows/Cell.java |  4 +--
 .../compaction/BlacklistingCompactionsTest.java | 19 +++++++------
 .../sstable/SSTableCorruptionDetectionTest.java |  7 +++--
 .../io/sstable/SSTableWriterTestBase.java       | 11 +++----
 9 files changed, 38 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c2da233/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9544715,d081587..842174e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,18 @@@
 +3.8
 + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718)
 + * 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)
 + * Add repaired percentage metric (CASSANDRA-11503)
 +
 +
  3.7
  Merged from 3.0:
+  * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
   * Don't use static dataDirectories field in Directories instances (CASSANDRA-11647)
   * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
   * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c2da233/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
----------------------------------------------------------------------


Mime
View raw message