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/e2eb867b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2eb867b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2eb867b Branch: refs/heads/trunk Commit: e2eb867bdb6686f041cffcc5be2c02eee9397e9e Parents: f3ec5b4 a22d16b Author: T Jake Luciani <[email protected]> Authored: Wed Sep 16 09:33:59 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Wed Sep 16 09:33:59 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/view/MaterializedViewManager.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2eb867b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2296aa7,7bb5b71..512666e --- 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-rc1 + * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230) * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318) * Give index implementations more control over rebuild operations (CASSANDRA-10312) * Update index file format (CASSANDRA-10314)
