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/0174ad40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0174ad40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0174ad40 Branch: refs/heads/trunk Commit: 0174ad406ce24e5e2fb66369bbe59667f8ee64bb Parents: 307c196 f00a3da Author: T Jake Luciani <[email protected]> Authored: Thu Aug 27 14:38:34 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Thu Aug 27 14:38:34 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/view/TemporalRow.java | 188 +++++++++++++------ .../cql3/MaterializedViewLongTest.java | 8 +- .../cassandra/cql3/MaterializedViewTest.java | 26 +++ 4 files changed, 156 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0174ad40/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 571889a,eef7974..7c985dc --- 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 + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197) * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181) * Fix double flushing of secondary index tables (CASSANDRA-10180)
