Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39d5e6aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39d5e6aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39d5e6aa Branch: refs/heads/trunk Commit: 39d5e6aae56e09a3e5b193285357f7d9ad987c83 Parents: df58c1f e36d233 Author: Sam Tunnicliffe <[email protected]> Authored: Wed Mar 16 11:16:22 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Mar 16 11:16:22 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/SerializationHeader.java | 2 +- .../org/apache/cassandra/tools/SSTableExport.java | 14 ++++++++------ .../apache/cassandra/tools/SSTableMetadataViewer.java | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39d5e6aa/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5107e18,1ff4e6d..6897d61 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,6 +1,16 @@@ +3.6 + * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099) + * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274) + * Refuse to start and print txn log information in case of disk + corruption (CASSANDRA-10112) + * Resolve some eclipse-warnings (CASSANDRA-11086) + * (cqlsh) Show static columns in a different color (CASSANDRA-11059) + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207) + + 3.5 Merged from 3.0: + * SSTableExport supports secondary index tables (CASSANDRA-11330) * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
