cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Date Thu, 26 May 2016 02:57:27 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/81902bad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81902bad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81902bad

Branch: refs/heads/trunk
Commit: 81902bad6c3c703bd255c70d641b197b3d132da7
Parents: 9c8ee4c 68d20ed
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Thu May 26 10:54:01 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Thu May 26 10:54:01 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 NEWS.txt                                        |  11 +
 conf/cassandra.yaml                             |   8 +-
 .../org/apache/cassandra/config/Config.java     |   6 +
 .../cassandra/config/DatabaseDescriptor.java    |   8 +
 .../apache/cassandra/db/ClusteringPrefix.java   |   4 +-
 .../columniterator/AbstractSSTableIterator.java |   2 +-
 .../cassandra/db/marshal/AbstractType.java      |  46 +++-
 src/java/org/apache/cassandra/db/rows/Rows.java |   2 +-
 .../cassandra/db/rows/UnfilteredSerializer.java |  13 +-
 .../io/sstable/SSTableIdentityIterator.java     |   5 +
 .../io/sstable/format/big/BigTableScanner.java  |   2 +-
 .../io/util/RebufferingInputStream.java         |   2 +-
 .../compaction/BlacklistingCompactionsTest.java |  45 +++-
 .../cassandra/index/sasi/SASIIndexTest.java     |   8 +-
 .../sstable/SSTableCorruptionDetectionTest.java | 247 +++++++++++++++++++
 .../cassandra/io/sstable/SSTableWriterTest.java |  49 +++-
 .../io/sstable/SSTableWriterTestBase.java       |  10 +-
 18 files changed, 439 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81902bad/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81902bad/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
----------------------------------------------------------------------


Mime
View raw message