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/3e531527 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e531527 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e531527 Branch: refs/heads/trunk Commit: 3e5315277c85cf6abdaea7b733ec346216ca730a Parents: b2b4f15 4378b58 Author: Sylvain Lebresne <[email protected]> Authored: Tue Dec 1 10:28:10 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Dec 1 10:28:10 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/CacheService.java | 4 ++++ .../cassandra/io/sstable/LegacySSTableTest.java | 19 ++++++++++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e531527/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 57769db,bd14e67..99777ec --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.1 +3.1 +Merged from 3.0: + * Fix error when saving cached key for old format sstable (CASSANDRA-10778) * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758) * Fix SELECT statement with IN restrictions on partition key, ORDER BY and LIMIT (CASSANDRA-10729)
