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/dc6f5bdb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc6f5bdb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc6f5bdb Branch: refs/heads/trunk Commit: dc6f5bdb0aa530b705873dca42a7c59bf95c96d6 Parents: 127f7c5 6c3fa8e Author: T Jake Luciani <j...@apache.org> Authored: Wed Oct 7 15:48:05 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Oct 7 15:48:05 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/view/ViewUtils.java | 2 +- .../apache/cassandra/service/StorageProxy.java | 91 +++++++++++--------- 3 files changed, 52 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc6f5bdb/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 518d722,0bac64e..16958a1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ +3.2 + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413) * Re-populate token metadata after commit log recovery (CASSANDRA-10293) * Provide additional metrics for materialized views (CASSANDRA-10323) * Flush system schema tables after local schema changes (CASSANDRA-10429) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc6f5bdb/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
