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/5dd2247d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dd2247d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5dd2247d Branch: refs/heads/trunk Commit: 5dd2247dd8e2bcd4ccff04c9d3b236b354184c46 Parents: 3c4a3bc 10c65d4 Author: Robert Stupp <[email protected]> Authored: Sat Oct 17 11:40:12 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Sat Oct 17 11:40:12 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ .../cassandra/db/commitlog/CommitLogSegmentManager.java | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dd2247d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 725cc9f,9b86ebd..67df8c2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,8 +1,13 @@@ +3.2 + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + + 3.0 + Merged from 2.1: + * AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377) + + 3.0-rc2 * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes (CASSANDRA-10473) * Remove circular references in SegmentedFile (CASSANDRA-10543)
