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/1bcf0c7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bcf0c7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bcf0c7b Branch: refs/heads/trunk Commit: 1bcf0c7b671d53688c634ed00700510ad63b322e Parents: 4034dc9 e0ce1dd Author: Sylvain Lebresne <[email protected]> Authored: Fri Oct 16 15:54:21 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Oct 16 15:54:21 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/LegacyLayout.java | 135 ++++++++++++++----- 2 files changed, 104 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bcf0c7b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index eb59885,e2d9dd7..e98de55 --- 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 + * Fix handling of static columns for range tombstones in thrift (CASSANDRA-10174) * Support empty ColumnFilter for backward compatility on empty IN (CASSANDRA-10471) * Remove Pig support (CASSANDRA-10542) * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)
