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/1cb9a02b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1cb9a02b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1cb9a02b Branch: refs/heads/trunk Commit: 1cb9a02bd951b424d960047297084d6ce4b18b6c Parents: 0e3da95 a52597d Author: Yuki Morishita <[email protected]> Authored: Thu Oct 15 17:31:56 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Oct 15 17:31:56 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + debian/cassandra.in.sh | 4 ++++ src/java/org/apache/cassandra/db/lifecycle/LogFile.java | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cb9a02b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e2d989c,dcacc69..5265215 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ +3.2 + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0-rc2 + * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522) * Revert CASSANDRA-7486, make CMS default GC, move GC config to conf/jvm.options (CASSANDRA-10403) * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447)
