Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93bd9ec2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93bd9ec2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93bd9ec2 Branch: refs/heads/trunk Commit: 93bd9ec25382fdd651f9931de924fd1872bdb60b Parents: cbde967 3632811 Author: Sylvain Lebresne <[email protected]> Authored: Mon Mar 31 12:36:36 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Mar 31 12:36:36 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 10 ++-- .../org/apache/cassandra/config/CFMetaData.java | 10 ++-- src/java/org/apache/cassandra/db/Cell.java | 10 ---- .../apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../db/columniterator/IndexedSliceReader.java | 53 +++----------------- .../db/columniterator/SSTableNamesIterator.java | 14 ++---- .../db/columniterator/SimpleSliceReader.java | 7 +-- .../cassandra/db/compaction/Scrubber.java | 23 ++------- .../apache/cassandra/io/sstable/Descriptor.java | 17 +------ .../io/sstable/SSTableIdentityIterator.java | 3 +- .../cassandra/io/sstable/SSTableReader.java | 6 +-- .../cassandra/io/sstable/SSTableScanner.java | 2 - .../cassandra/io/sstable/SSTableWriter.java | 11 +--- .../metadata/LegacyMetadataSerializer.java | 37 ++++---------- .../io/sstable/metadata/StatsMetadata.java | 36 +++++-------- .../apache/cassandra/tools/SSTableExport.java | 6 +-- .../cassandra/io/sstable/LegacySSTableTest.java | 4 +- 18 files changed, 60 insertions(+), 192 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/93bd9ec2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e604304,9e104e0..7166ed9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -42,7 -37,9 +42,8 @@@ * Serialize batchlog mutations with the version of the target node (CASSANDRA-6931) * Optimize CounterColumn#reconcile() (CASSANDRA-6953) + * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869) Merged from 2.0: - * Restrict Windows to parallel repairs (CASSANDRA-6907) * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) * Fix NPE in MeteredFlusher (CASSANDRA-6820) * Fix race processing range scan responses (CASSANDRA-6820) http://git-wip-us.apache.org/repos/asf/cassandra/blob/93bd9ec2/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/93bd9ec2/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/93bd9ec2/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ----------------------------------------------------------------------
