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/be01d8eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be01d8eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be01d8eb Branch: refs/heads/trunk Commit: be01d8eb8f5fe5c37cab314938c49edb9f435926 Parents: 735bd65 2998bb3 Author: T Jake Luciani <j...@apache.org> Authored: Fri Nov 6 14:33:29 2015 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Fri Nov 6 14:33:29 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/db/view/TemporalRow.java | 31 +++++++++++++++ src/java/org/apache/cassandra/db/view/View.java | 24 ++++++++--- .../cassandra/cql3/ViewFilteringTest.java | 14 +++++++ .../org/apache/cassandra/cql3/ViewTest.java | 42 ++++++++++++++++++++ 5 files changed, 108 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be01d8eb/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index dc82bd4,3662e6e..88d3fd2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,12 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Fix AssertionError while flushing memtable due to materialized views + incorrectly inserting empty rows (CASSANDRA-10614) * Store UDA initcond as CQL literal in the schema table, instead of a blob (CASSANDRA-10650) * Don't use -1 for the position of partition key in schema (CASSANDRA-10491) * Fix distinct queries in mixed version cluster (CASSANDRA-10573) http://git-wip-us.apache.org/repos/asf/cassandra/blob/be01d8eb/src/java/org/apache/cassandra/db/view/View.java ----------------------------------------------------------------------
