Merge branch 'cassandra-2.1' into cassandra-2.2 cassandra-2.2.12
authorPaulo Motta <paulo@apache.org>
Sat, 10 Feb 2018 16:53:20 +0000 (14:53 -0200)
committerPaulo Motta <paulo@apache.org>
Sat, 10 Feb 2018 16:54:56 +0000 (14:54 -0200)
commit1602e606348959aead18531cb8027afb15f276e7
treef847fa88478206be751777678cc85c7cc6184a1b
parentaa831c98f7a6268046915036bdc2d2f3b537dd78
parentb2949439ec62077128103540e42570238520f4ee
Merge branch 'cassandra-2.1' into cassandra-2.2
53 files changed:
CHANGES.txt
NEWS.txt
debian/rules
redhat/cassandra.spec
src/java/org/apache/cassandra/cql3/Attributes.java
src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
src/java/org/apache/cassandra/db/AbstractNativeCell.java
src/java/org/apache/cassandra/db/BufferExpiringCell.java
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
src/java/org/apache/cassandra/db/compaction/Scrubber.java
src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java
src/java/org/apache/cassandra/service/StorageService.java
src/java/org/apache/cassandra/service/StorageServiceMBean.java
src/java/org/apache/cassandra/thrift/ThriftValidation.java
src/java/org/apache/cassandra/tools/NodeProbe.java
src/java/org/apache/cassandra/tools/StandaloneScrubber.java
src/java/org/apache/cassandra/tools/nodetool/Scrub.java
test/data/negative-local-expiration-test/table1/lb-1-big-CompressionInfo.db
test/data/negative-local-expiration-test/table1/lb-1-big-Data.db
test/data/negative-local-expiration-test/table1/lb-1-big-Digest.adler32
test/data/negative-local-expiration-test/table1/lb-1-big-Filter.db
test/data/negative-local-expiration-test/table1/lb-1-big-Index.db
test/data/negative-local-expiration-test/table1/lb-1-big-Statistics.db
test/data/negative-local-expiration-test/table1/lb-1-big-Summary.db
test/data/negative-local-expiration-test/table1/lb-1-big-TOC.txt
test/data/negative-local-expiration-test/table2/lb-1-big-CompressionInfo.db
test/data/negative-local-expiration-test/table2/lb-1-big-Data.db
test/data/negative-local-expiration-test/table2/lb-1-big-Digest.adler32
test/data/negative-local-expiration-test/table2/lb-1-big-Filter.db
test/data/negative-local-expiration-test/table2/lb-1-big-Index.db
test/data/negative-local-expiration-test/table2/lb-1-big-Statistics.db
test/data/negative-local-expiration-test/table2/lb-1-big-Summary.db
test/data/negative-local-expiration-test/table2/lb-1-big-TOC.txt
test/data/negative-local-expiration-test/table3/lb-1-big-CompressionInfo.db
test/data/negative-local-expiration-test/table3/lb-1-big-Data.db
test/data/negative-local-expiration-test/table3/lb-1-big-Digest.adler32
test/data/negative-local-expiration-test/table3/lb-1-big-Filter.db
test/data/negative-local-expiration-test/table3/lb-1-big-Index.db
test/data/negative-local-expiration-test/table3/lb-1-big-Statistics.db
test/data/negative-local-expiration-test/table3/lb-1-big-Summary.db
test/data/negative-local-expiration-test/table3/lb-1-big-TOC.txt
test/data/negative-local-expiration-test/table4/lb-1-big-CompressionInfo.db
test/data/negative-local-expiration-test/table4/lb-1-big-Data.db
test/data/negative-local-expiration-test/table4/lb-1-big-Digest.adler32
test/data/negative-local-expiration-test/table4/lb-1-big-Filter.db
test/data/negative-local-expiration-test/table4/lb-1-big-Index.db
test/data/negative-local-expiration-test/table4/lb-1-big-Statistics.db
test/data/negative-local-expiration-test/table4/lb-1-big-Summary.db
test/data/negative-local-expiration-test/table4/lb-1-big-TOC.txt
test/unit/org/apache/cassandra/cql3/validation/operations/TTLTest.java
test/unit/org/apache/cassandra/db/ScrubTest.java