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/17f8788e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17f8788e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17f8788e Branch: refs/heads/trunk Commit: 17f8788ef80ff541f43141e0181efe9baea46db9 Parents: 78dcf79 b586868 Author: T Jake Luciani <j...@apache.org> Authored: Tue Sep 1 15:31:27 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Sep 1 15:31:27 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Keyspace.java | 29 +++++++++++------ .../db/commitlog/CommitLogReplayer.java | 13 +++++++- .../db/view/MaterializedViewBuilder.java | 13 +------- .../db/view/MaterializedViewManager.java | 8 ++--- .../apache/cassandra/service/StorageProxy.java | 33 +++++++------------- .../cassandra/streaming/StreamReceiveTask.java | 8 +++-- .../cassandra/cql3/MaterializedViewTest.java | 26 +++++++++++++++ 8 files changed, 79 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17f8788e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0c94103,88b99a2..9a4b48f --- 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 + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164) * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901) * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554) * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
