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/640ecf35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/640ecf35 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/640ecf35 Branch: refs/heads/trunk Commit: 640ecf35404284d198610f6fee01e39bd5a3ced7 Parents: 5321a4a 707b2da Author: Yuki Morishita <[email protected]> Authored: Mon Aug 24 09:48:01 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon Aug 24 09:48:01 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/640ecf35/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 25fb03e,c866905..a925784 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,6 +1,10 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-beta2 * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917) + * Fix sstablerepairedset (CASSANDRA-10132) 3.0.0-beta1
