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/5321a4ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5321a4ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5321a4ad Branch: refs/heads/trunk Commit: 5321a4ad7642f2edaf9e0e735ff54eb0156de6fb Parents: 99fc7d9 d0e8ba4 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Aug 24 17:22:09 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Aug 24 17:22:09 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 4 ++ .../org/apache/cassandra/config/CFMetaData.java | 5 ++ .../AlterMaterializedViewStatement.java | 11 +++- .../cql3/statements/AlterTableStatement.java | 9 ++++ .../cql3/statements/BatchStatement.java | 55 ++++++++++++++++---- .../CreateMaterializedViewStatement.java | 13 +++++ 6 files changed, 87 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5321a4ad/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4a446aa,930fb5a..25fb03e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,7 +1,11 @@@ +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) + + 3.0.0-beta1 * Redesign secondary index API (CASSANDRA-9459, 7771, 9041) * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125)
