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/083815e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/083815e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/083815e4 Branch: refs/heads/trunk Commit: 083815e4f7168f6a096c5e6baa54e37dd7cc0b73 Parents: c5c721d dc5b268 Author: T Jake Luciani <[email protected]> Authored: Thu Sep 3 16:39:54 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Thu Sep 3 16:39:54 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../CreateMaterializedViewStatement.java | 7 ++- .../cassandra/cql3/MaterializedViewTest.java | 49 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/083815e4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 432881e,fb33de0..ef6509c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-beta2 + * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation (CASSANDRA-10147) * Improve batchlog write patch (CASSANDRA-9673) * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164) * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901)
