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/65000b3c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65000b3c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65000b3c Branch: refs/heads/trunk Commit: 65000b3c2d508c6f972022607fb14b27d7d8a11d Parents: be2cf1a 4a00438 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Nov 5 11:16:05 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Nov 5 11:16:05 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/UnfilteredDeserializer.java | 45 +++++++++++++++++++- .../columniterator/AbstractSSTableIterator.java | 4 +- .../columniterator/SSTableReversedIterator.java | 17 ++------ 4 files changed, 51 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65000b3c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4fcf4e9,1ff2fdb..14b6007 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.2 + * 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) + + 3.0 + * Fix reading of legacy sstables (CASSANDRA-10590) * Use CQL type names in schema metadata tables (CASSANDRA-10365) * Guard batchlog replay against integer division by zero (CASSANDRA-9223) * Fix bug when adding a column to thrift with the same name than a primary key (CASSANDRA-10608)
