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/f02e13a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f02e13a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f02e13a8 Branch: refs/heads/trunk Commit: f02e13a86964e6d95a8427bc42e2279612848be7 Parents: 42f7611 cc2478d Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Oct 14 16:19:10 2015 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Oct 14 16:19:10 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 1 + .../apache/cassandra/db/ConsistencyLevel.java | 40 ++++++++++++++++++-- .../exceptions/UnavailableException.java | 5 +++ 4 files changed, 44 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f02e13a8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6eb5a31,6b7b4eb..aff533f --- 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-rc2 + * Allow EACH_QUORUM for reads (CASSANDRA-9602) * Fix potential ClassCastException while upgrading (CASSANDRA-10468) * Fix NPE in MVs on update (CASSANDRA-10503) * Only include modified cell data in indexing deltas (CASSANDRA-10438)
