Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f7b3898 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f7b3898 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f7b3898 Branch: refs/heads/cassandra-3.1 Commit: 6f7b38987e45875d6857bc9ec6c72671d22bf82b Parents: 11b073e 49c9c01 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Nov 11 08:55:34 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Nov 11 08:55:34 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableRewriter.java | 5 +--- .../org/apache/cassandra/utils/CLibrary.java | 29 ++++++++++---------- .../apache/cassandra/utils/CLibraryTest.java | 3 +- 4 files changed, 17 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f7b3898/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b6ab144,d271c95..5a1e79a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.1 +3.1 +Merged from 3.0: + * Keep the file open in trySkipCache (CASSANDRA-10669) * Updated trigger example (CASSANDRA-10257) Merged from 2.2: * (Hadoop) fix splits calculation (CASSANDRA-10640)
